first commit

.gitignore

@@ -0,0 +1,8 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test

pom.xml

@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.example</groupId>
+    <artifactId>dil-tms</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.7.RELEASE</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <!--Spring Cloud的版本-->
+                <version>Finchley.SR2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <repositories>
+        <repository>
+            <id>maven-public</id>
+            <name>steerinfo maven-public</name>
+            <url>https://nexus.steerinfo.com/repository/maven-public/</url>
+        </repository>
+    </repositories>
+
+    <distributionManagement>
+        <repository>
+            <id>maven-releases</id>
+            <name>steerinfo nexus-releases</name>
+            <url>http://nexus.steerinfo.com/repository/maven-releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>maven-snapshots</id>
+            <url>http://nexus.steerinfo.com/repository/maven-snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
+    <dependencies>
+        <!--websocket-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!--mybatisPlus-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>3.4.2</version>
+        </dependency>
+
+        <!--swagger-->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!--steerinfo-->
+        <dependency>
+            <groupId>com.steerinfo</groupId>
+            <artifactId>framework</artifactId>
+            <version>1.0</version>
+        </dependency>
+
+
+
+
+    </dependencies>
+    <build>
+        <plugins>
+            <!--             自动生成代码文件 -->
+            <plugin>
+                <groupId>com.steerinfo</groupId>
+                <artifactId>generator-maven-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <connUrl>jdbc:oracle:thin:@192.168.1.51:1521:steerinfo</connUrl>
+                    <user>dilusr</user>
+                    <password>stinf#0420</password>
+                    <!--包名-->
+                    <targetPackage>com.steerinfo.dil</targetPackage>
+                    <tables>
+                        <!--<table>TRANSPORT_ORDER</table>&lt;!&ndash;运单&ndash;&gt;-->
+                        <!--<table>TRANSPORT_ORDER_MATERIAL</table>&lt;!&ndash;运单-物资&ndash;&gt;-->
+                        <!--<table>TRANSPORT_ENTRY_FACTORY_RESULT</table>&lt;!&ndash;进厂&ndash;&gt;-->
+                        <!--<table>TRANSPORT_LEAVE_FACTORY_RESULT</table>&lt;!&ndash;出厂&ndash;&gt;-->
+                        <!--<table>TRANSPORT_LOAD_RESULT</table>&lt;!&ndash;装货&ndash;&gt;-->
+                        <!--<table>TRANSPORT_RESULT_LOAD_MATERIAL</table>&lt;!&ndash;装货-物资&ndash;&gt;-->
+                        <!--<table>TRANSPORT_UNLOAD_RESULT</table>&lt;!&ndash;卸货&ndash;&gt;-->
+                        <!--<table>TRANSPORT_RESULT_UNLOAD_MATERI</table>&lt;!&ndash;卸货-物资&ndash;&gt;-->
+                        <!--<table>TRANSPORT_CALCULATE_RESULT</table>&lt;!&ndash;计量&ndash;&gt;-->
+                        <!--<table>TRANSPORT_MEASURE_RESULT</table>&lt;!&ndash;计时&ndash;&gt;-->
+                        <!--<table>TRANSPORT_TOTAL_RESULT</table>&lt;!&ndash;总表&ndash;&gt;-->
+                        <!--<table>TRANSPORT_OPERATION_PATH</table>&lt;!&ndash;作业路径&ndash;&gt;-->
+                        <!--<table>TRANSPORT_OPERATION_PROCESS</table>&lt;!&ndash;作业环节&ndash;&gt;-->
+                        <!--<table>TRANSPORT_OPERATION_TYPE</table>&lt;!&ndash;作业类型&ndash;&gt;-->
+                        <!--<table>TRANSPORT_PATH_PROCESS</table>&lt;!&ndash;作业路径-环节&ndash;&gt;-->
+                        <!--<table>TRANSPORT_PROCESS_RESULT</table>-->
+                        <!--<table>TRANSPORT_ORDER_PROGRESS</table>-->
+<!--                        <table>TMSSHIP_WATER_QUALITY_RESULT</table>-->
+<!--                        <table>OMSSHIP_INSTRUCTIONS_CAPACITY</table>-->
+                        <table>WMSH_OUTBOUND_RESULT</table>
+<!--                        <table>TMSSHIP_BARGE_OPERATION</table>-->
+<!--                        <table>TMSSHIP_LOAD_SHIP_RESULT</table>-->
+<!--                        <table>TMSSHIP_SHIP_LOCATION</table>-->
+<!--                        <table>TMSSHIP_UNLOAD_SHIP_RESULT</table>-->
+<!--                        <table>TMSSHIP_WATER_QUALITY_RESULT</table>-->
+                    </tables>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>steerinfo</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*.xml</include>
+                </includes>
+            </resource>
+
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+</project>

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

@@ -0,0 +1,28 @@
+package com.steerinfo;
+
+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.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/4/21 14:32
+ * @Version 1.0
+ */
+@SpringBootApplication
+@ServletComponentScan
+@EnableScheduling
+@MapperScan({"com.steerinfo.dil.mapper"})
+@EnableDiscoveryClient
+@EnableTransactionManagement
+@EnableFeignClients(basePackages="com.steerinfo.dil.feign")
+public class DilApplicationMain {
+    public static void main(String[] args) {
+        SpringApplication.run(DilApplicationMain.class,args);
+    }
+}

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/WebSocketConfig.java

@@ -0,0 +1,43 @@
+package com.steerinfo.dil.config;
+
+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;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
+        stompEndpointRegistry
+                .addEndpoint("/webSocket")
+                .setAllowedOrigins("*")
+                .withSockJS(); //使用sockJS
+
+    }
+
+    @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) {
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.dil.service.IAmsshipCargoTransferResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * AmsshipCargoTransferResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:36
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipCargoTransferResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/amsshipcargotransferresults")
+public class AmsshipCargoTransferResultController extends BaseRESTfulController {
+
+    @Autowired
+    IAmsshipCargoTransferResultService amsshipCargoTransferResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    @ApiOperation(value="展示货权转移表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "66", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getAmsshipCargoTranferResultList")
+    public RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                          Integer pageNum,
+                                                          Integer pageSize,
+                                                          Integer apiId){
+        List<Map<String,Object>> list = amsshipCargoTransferResultService.seletCargoTransfer(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsshipCargoTransferResultService.seletCargoTransfer(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+    //新增
+    @ApiOperation(value="新增", notes="根据amsshipCargoTransferResult对象创建")
+    @ApiImplicitParam(name = "amsshipCargoTransferResult", value = "详细实体amsshipCargoTransferResult", required = true, dataType = "amsshipCargoTransferResult", paramType = "java.util.Map")
+    @PostMapping(value = "/insertamsshipCargoTransferResult")
+    public RESTfulResult insertamsshipCargoTransferResult(@RequestBody AmsshipCargoTransferResult amsshipCargoTransferResult){
+        int code=amsshipCargoTransferResultService.insertSelective(amsshipCargoTransferResult);
+        System.out.println(code);
+        return success(code);
+    }
+    //根据id获取信息
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value ="/selectByCargoTranferResultId/{cargoTransferResultId}")
+    public RESTfulResult selectByCargoTranferResultId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId){
+        System.out.println(cargoTransferResultId);
+        List<Map<String,Object>> amsshipCargoTransferResult = amsshipCargoTransferResultService.selectByOrder(cargoTransferResultId);
+        System.out.println(amsshipCargoTransferResult);
+        return success(amsshipCargoTransferResult);
+    }
+    //修改
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsshipDeliveryAttorney信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "amsshipDeliveryAttorney", value = "详细实体amsshipDeliveryAttorney", required = true, dataType = "amsshipDeliveryAttorney")
+    })
+    @PostMapping(value = "/editCargoTransferResult", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult editCargoTransferResult(@RequestBody  AmsshipCargoTransferResult  amsshipCargoTransferResult){
+        amsshipCargoTransferResultService.updateByPrimaryKeySelective(amsshipCargoTransferResult);
+        System.out.println(amsshipCargoTransferResult);
+        return success(amsshipCargoTransferResult);
+    }
+    //    删除
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value ="/deleteByCargoId/{cargoTransferResultId}")//BigDecimal
+    public RESTfulResult deleteByCargoId(@PathVariable("cargoTransferResultId") Integer cargoTransferResultId){
+        System.out.println(cargoTransferResultId);
+        AmsshipCargoTransferResult amsshipCargoTransferResult = new AmsshipCargoTransferResult();
+        amsshipCargoTransferResult.setCargoTransferResultId(new BigDecimal(cargoTransferResultId));
+        BigDecimal deleted = new BigDecimal(1);
+        amsshipCargoTransferResult.setDeleted(deleted);
+        amsshipCargoTransferResultService.updateByPrimaryKeySelective(amsshipCargoTransferResult);
+        return success();
+    }
+    //得到收货人id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @GetMapping(value = "/getGroupId")
+    public RESTfulResult getGroup(){
+        List<Map<String,Object>> list= amsshipCargoTransferResultService.getGroup();
+        return success(list);
+    }
+    //得到货物id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @GetMapping(value = "/getCargoId")
+    public RESTfulResult getCargoId(){
+        List<Map<String,Object>> list= amsshipCargoTransferResultService.getCargoId();
+        return success(list);
+    }
+    //得到批次id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @GetMapping(value = "/insertBetchId")
+    public RESTfulResult insertBetchId(){
+        List<Map<String,Object>> list= amsshipCargoTransferResultService.insertBetchId();
+        return success(list);
+    }
+}

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

@@ -0,0 +1,191 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.dil.service.IAmsshipDeliveryAttorneyService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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 oracle.jdbc.proxy.annotation.Post;
+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;
+
+/**
+ * AmsshipDeliveryAttorney RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:44
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryAttorney RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/amsshipdeliveryattorneys")
+public class AmsshipDeliveryAttorneyController extends BaseRESTfulController {
+
+    @Autowired
+    IAmsshipDeliveryAttorneyService amsshipDeliveryAttorneyService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    @ApiOperation(value="展示提货委托表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "73", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getAmsshipDeliveryAttroneyList")
+    public RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        Integer apiId
+    ){
+        List<Map<String,Object>> list = amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList =amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    //新增
+    @ApiOperation(value="新增", notes="根据amsshipDeliveryAttorney对象创建")
+    @ApiImplicitParam(name = "amsshipDeliveryAttorney", value = "详细实体amsshipDeliveryAttorney", required = true, dataType = "AmsshipDeliveryAttorney", paramType = "java.util.Map")
+    @PostMapping(value = "/insertshipDeliveryAttorney")
+    public RESTfulResult insertshipDeliveryAttorney(@RequestBody  AmsshipDeliveryAttorney amsshipDeliveryAttorney){
+        System.out.println(amsshipDeliveryAttorney);
+        int code=amsshipDeliveryAttorneyService.insert(amsshipDeliveryAttorney);
+        return success(code);
+    }
+    //渲染修改信息
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+
+    @PostMapping(value = "/getDeliveryAttorneyId/{attorneyId}")
+    public RESTfulResult getDeliveryAttorneyId(@PathVariable Integer attorneyId){
+        List<Map<String,Object>> amsshipDeliveryAttorney =amsshipDeliveryAttorneyService.getDeliveryAttorneyId(attorneyId);
+        return success(amsshipDeliveryAttorney);
+    }
+
+
+    //    @DeleteMapping(value = "/deleteByAttorneyId")//BigDecimal
+//    public RESTfulResult deleteByPrimaryKey(BigDecimal attorneyId){
+//        amsshipDeliveryAttorneyService.deleteByPrimaryKey(attorneyId);
+//        return success();
+//    }
+    //得到收货人id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @GetMapping(value = "/getPortName")
+    public RESTfulResult getPortName(){
+        List<Map<String,Object>> list= amsshipDeliveryAttorneyService.getPortName();
+        return success(list);
+    }
+    //得到放货通知单Id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+
+    @GetMapping(value = "/getNoticeId")
+    public RESTfulResult getNoticeId(){
+        List<Map<String,Object>> list= amsshipDeliveryAttorneyService.getNoticeId();
+        return success(list);
+    }
+    //删除
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteByAttorneyId/{attorneyId}")
+    public RESTfulResult deleteByAttorneyId(@PathVariable("attorneyId")  Integer attorneyId){
+        System.out.println(attorneyId);
+        AmsshipDeliveryAttorney amsshipDeliveryAttorney=new AmsshipDeliveryAttorney();
+        amsshipDeliveryAttorney.setAttorneyId(new BigDecimal(attorneyId));
+        Short deleted=1;
+        amsshipDeliveryAttorney.setDeleted(deleted);
+        amsshipDeliveryAttorneyService.updateByPrimaryKeySelective(amsshipDeliveryAttorney);
+        return  success();
+    }
+    //修改
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsshipDeliveryAttorney信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "amsshipDeliveryAttorney", value = "详细实体amsshipDeliveryAttorney", required = true, dataType = "amsshipDeliveryAttorney")
+    })
+    @PostMapping(value = "/editDeliveryAttroney", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult editDeliveryAttroney(@RequestBody AmsshipDeliveryAttorney amsshipDeliveryAttorney){
+        amsshipDeliveryAttorneyService.updateByPrimaryKeySelective(amsshipDeliveryAttorney);
+        System.out.println(amsshipDeliveryAttorney);
+        return success(amsshipDeliveryAttorney);
+    }
+    //下发
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/sendDeliveryAttorneyStatus/{attorneyId}")
+    public RESTfulResult sendDeliveryAttorneyStatus(@PathVariable("attorneyId") Integer attorneyId){
+        AmsshipDeliveryAttorney amsshipDeliveryAttorney=new AmsshipDeliveryAttorney();
+        amsshipDeliveryAttorney.setAttorneyId(new BigDecimal(attorneyId));
+        amsshipDeliveryAttorney.setAttorneyDistributionStatus("未下发");
+        amsshipDeliveryAttorneyService.updateByPrimaryKeySelective(amsshipDeliveryAttorney);
+        return success(amsshipDeliveryAttorney);
+    }
+    /**
+     * 获取提货通知单id
+     * @return
+     */
+    @GetMapping("getAttorneyId")
+    @ApiOperation(value = "获取提货通知单id下拉列表")
+    public RESTfulResult getAttorneyId(){
+
+        return success(amsshipDeliveryAttorneyService.getAttorneyId());
+    }
+
+    /**
+     * 获取发件人id
+     * @return
+     */
+    @GetMapping("getPortId")
+    @ApiOperation(value = "获取港口id下拉列表")
+    public RESTfulResult getPortId(){
+
+        return success(amsshipDeliveryAttorneyService.getPortId());
+    }
+
+    /**
+     * 获取收件人id
+     * @return
+     */
+    @GetMapping("getPierId")
+    @ApiOperation(value = "获取码头id下拉列表")
+    public RESTfulResult getPierId(){
+
+        return success(amsshipDeliveryAttorneyService.getPierId());
+    }
+
+    /**
+     * 获取仓库id
+     * @return
+     */
+    @GetMapping("getRmRawId")
+    @ApiOperation(value = "获取码头id下拉列表")
+    public RESTfulResult getRmRawId(){
+
+        return success(amsshipDeliveryAttorneyService.getRmRawId());
+    }
+
+}

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

@@ -0,0 +1,180 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.dil.service.IAmsshipDeliveryNoticeService;
+
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * AmsshipDeliveryNotice RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:54
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryNotice RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/amsshipdeliverynotices")
+public class AmsshipDeliveryNoticeController extends BaseRESTfulController {
+
+    @Autowired
+    IAmsshipDeliveryNoticeService amsshipDeliveryNoticeService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    @ApiOperation(value="展示发货通知单表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "69", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getshipDeliveryNoticeList")
+    public RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId){
+        List<Map<String,Object>> list = amsshipDeliveryNoticeService.selectShipDeliveryNotice(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = amsshipDeliveryNoticeService.selectShipDeliveryNotice(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+    //新增
+    @ApiOperation(value="新增", notes="根据AmsshipDeliveryNotice对象创建")
+    @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "AmsshipDeliveryNotice", paramType = "java.util.Map")
+
+    @PostMapping(value = "/insertDeliveryNotice")
+    public RESTfulResult insertSelective(@RequestBody AmsshipDeliveryNotice amsshipDeliveryNotice){
+        int code=amsshipDeliveryNoticeService.insert(amsshipDeliveryNotice);
+        return success(code);
+    }
+    //    //查询发货通知单信息
+//    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+//    @ApiImplicitParam(paramType = "path", name = "noticeId", value = "noticeId", required = true, dataType = "BigDecimal")
+//
+//    @GetMapping(value = "/{noticeId}")
+//    public RESTfulResult get(@PathVariable BigDecimal noticeId){
+//        AmsshipDeliveryNotice amsshipDeliveryNotice = amsshipDeliveryNoticeService.selectByPrimaryKey(noticeId);
+//        return success(amsshipDeliveryNotice);
+//    }
+    // 渲染信息
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsshipDeliveryNotice信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "noticeId", value = "noticeId", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "AmsshipDeliveryNotice")
+    })
+    @PostMapping(value = "/selectByNoticeId/{noticeId}")
+    public RESTfulResult update(@PathVariable("noticeId") Integer noticeId){
+        List<Map<String,Object>> amsshipDeliveryNotice =amsshipDeliveryNoticeService.selectByNoticeId(noticeId);
+        return  success(amsshipDeliveryNotice);
+    }
+    //    删除详细信息
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "noticeId", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("omsshipshipmentinstructions:delete")
+    @DeleteMapping(value = "/{noticeId}")//BigDecimal
+    public RESTfulResult deleteByPrimaryKey(BigDecimal noticeId){
+        amsshipDeliveryNoticeService.deleteByPrimaryKey(noticeId);
+        return success();
+    }
+    //得到收货人id
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+
+    @GetMapping(value ="/getResultNumber")
+    public RESTfulResult getResultNumber(){
+        List<Map<String,Object>> list= amsshipDeliveryNoticeService.getResultNumber();
+        return success(list);
+    }
+    //得到承运单位
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+
+    @GetMapping(value ="/getcarrier")
+    public RESTfulResult getcarrier(){
+        List<Map<String,Object>> list= amsshipDeliveryNoticeService.getcarrier();
+        return success(list);
+    }
+    //得到委托单位
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @GetMapping(value ="/getShipper")
+    public RESTfulResult getShipper(){
+        List<Map<String,Object>> list= amsshipDeliveryNoticeService.getShipper();
+        return success(list);
+    }
+    //    //得到采购订单号
+//    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+//    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+//
+//    @GetMapping(value ="/getOrderNo")
+//    public RESTfulResult getOrderNo(){
+//        List<Map<String,Object>> list= amsshipDeliveryNoticeService.getOrderNo();
+//        return success(list);
+//    }
+    //删除
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value ="/deleteByNoticeId/{noticeId}")
+    public RESTfulResult deleteByNoticeId(@PathVariable("noticeId") Integer noticeId){
+//        初始话对象
+        AmsshipDeliveryNotice amsshipDeliveryNotice=new AmsshipDeliveryNotice();
+//         设置一个新的noticeId
+        amsshipDeliveryNotice.setNoticeId(new BigDecimal(noticeId));
+//         将删除状态设置为1.
+        Short deleted=1;
+//         将设置完的值传回后端
+        amsshipDeliveryNotice.setDeleted(deleted);
+        amsshipDeliveryNoticeService.updateByPrimaryKeySelective(amsshipDeliveryNotice);
+        return success();
+    }
+    //修改
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsshipDeliveryNotice信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "amsshipDeliveryNotice")
+    })
+    @PostMapping(value = "/editDeliveryNotice", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult editDeliveryNotice(@RequestBody AmsshipDeliveryNotice amsshipDeliveryNotice){
+        amsshipDeliveryNoticeService.updateByPrimaryKeySelective(amsshipDeliveryNotice);
+        System.out.println(amsshipDeliveryNotice);
+        return success(amsshipDeliveryNotice);
+    }
+    // 下发
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的amsshipDeliveryNotice信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "amsshipDeliveryNotice", value = "详细实体amsshipDeliveryNotice", required = true, dataType = "amsshipDeliveryNotice")
+    })
+    @PostMapping(value = "/sendDeliveryNotice/{noticeId}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult sendDeliveryNotice(@PathVariable("noticeId") Integer noticeId){
+        AmsshipDeliveryNotice amsshipDeliveryNotice =new AmsshipDeliveryNotice();
+        amsshipDeliveryNotice.setNoticeId(new BigDecimal(noticeId));
+        amsshipDeliveryNotice.setNoticeDistributionStatus("下发");
+        amsshipDeliveryNoticeService.updateByPrimaryKeySelective(amsshipDeliveryNotice);
+        System.out.println(amsshipDeliveryNotice);
+        return success(amsshipDeliveryNotice);
+    }
+}

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

@@ -0,0 +1,157 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.dil.model.TmsshipBargeOperation;
+import com.steerinfo.dil.service.IOmsshipInstructionsCapacityService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * OmsshipInstructionsCapacity RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipInstructionsCapacity RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/omsshipinstructionscapacitys")
+public class OmsshipInstructionsCapacityController extends BaseRESTfulController {
+
+    @Autowired
+    IOmsshipInstructionsCapacityService omsshipInstructionsCapacityService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 获取运单id
+     * @return
+     */
+    @GetMapping("getOrderId")
+    @ApiOperation(value = "获取运单id下拉列表")
+    public RESTfulResult getTask(){
+
+        return success(omsshipInstructionsCapacityService.getOrderId());
+    }
+
+    /**
+     * 展示船只信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示船只信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "instructionsId", value = "装船指令id", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "76", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getCapacities")
+    public RESTfulResult getCapacities(BigDecimal instructionsId,@RequestBody(required = false) Map<String,Object> mapVal,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId){
+        if (mapVal==null) {
+            mapVal = new HashMap<>();
+        }
+        mapVal.put("instructionsId",instructionsId);
+        List<Map<String,Object>> list = omsshipInstructionsCapacityService.selectCapacities(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = omsshipInstructionsCapacityService.selectCapacities(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    /**
+     * 新增
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @ApiOperation(value="新增", notes="根据OmsshipInstructionsCapacity对象创建")
+    @ApiImplicitParam(name = "omsshipInstructionsCapacity", value = "详细实体omsshipInstructionsCapacity", required = true, dataType = "OmsshipInstructionsCapacity")
+    @PostMapping(value = "/addInstructionsCapacity")
+    public RESTfulResult addInstructionsCapacity(@RequestBody OmsshipInstructionsCapacity omsshipInstructionsCapacity){
+        int code=omsshipInstructionsCapacityService.insert(omsshipInstructionsCapacity);
+        return success(code);
+    }
+
+    /**
+     * 获取发件人id
+     * @return
+     */
+    @GetMapping("getCapacityId")
+    @ApiOperation(value = "获取船id下拉列表")
+    public RESTfulResult getCapacityId(){
+        return success(omsshipInstructionsCapacityService.getCapacityId());
+    }
+
+    /**
+     * 查询
+     * @param instructionsCapacityId
+     * @return
+     */
+    @ApiOperation(value="查询表单信息")
+    @ApiImplicitParam(name = "instructionsCapacityId", value = "运单id", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("omsshipshipmentinstructions:create")
+    @PostMapping(value = "/getInstructionsCapacity/{instructionsCapacityId}")
+    public RESTfulResult getInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId){
+        List<Map<String,Object>> map = omsshipInstructionsCapacityService.selectInstructionsCapacity(instructionsCapacityId);
+        return success(map);
+    }
+
+    /**
+     * 修改船运信息
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @ApiOperation(value="修改船运信息", notes="根据OmsshipInstructionsCapacity对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "omsshipInstructionsCapacity",value = "船运字段",required = true,paramType = "OmsshipInstructionsCapacity")
+    })
+    @PostMapping("/updateInstructionsCapacity")
+    public RESTfulResult updateInstructionsCapacity(@RequestBody OmsshipInstructionsCapacity omsshipInstructionsCapacity) {
+        int code = omsshipInstructionsCapacityService.updateByPrimaryKeySelective(omsshipInstructionsCapacity);
+        return success(code);
+    }
+
+    /**
+     * 逻辑删除
+     * @param instructionsCapacityId
+     * @return
+     */
+    @ApiOperation(value="逻辑删除", notes="根据instructionsCapacityId删除")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "instructionsCapacityId",value = "船运字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteInstructionsCapacity/{instructionsCapacityId}")
+    public RESTfulResult deleteInstructionsCapacity(@PathVariable("instructionsCapacityId") BigDecimal instructionsCapacityId) {
+        int code = omsshipInstructionsCapacityService.deleteByPrimaryKey(instructionsCapacityId);
+        return success(code);
+    }
+
+}

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

@@ -0,0 +1,152 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.dil.service.IOmsshipShipmentInstructionsService;
+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;
+
+/**
+ * OmsshipShipmentInstructions RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipShipmentInstructions RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/omsshipshipmentinstructions")
+public class OmsshipShipmentInstructionsController extends BaseRESTfulController {
+
+    @Autowired
+    IOmsshipShipmentInstructionsService omsshipShipmentInstructionsService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 新增
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @ApiOperation(value="新增", notes="根据OmsshipShipmentInstructions对象创建")
+    @ApiImplicitParam(name = "omsshipShipmentInstructions", value = "详细实体omsshipShipmentInstructions", required = true, dataType = "OmsshipShipmentInstructions", paramType = "java.util.Map")
+    @PostMapping(value = "/addShipmentInstructions")
+    public RESTfulResult addShipmentInstructions(@RequestBody OmsshipShipmentInstructions omsshipShipmentInstructions){
+        int code=omsshipShipmentInstructionsService.insert(omsshipShipmentInstructions);
+        return success(code);
+    }
+
+    /**
+     * 查询
+     * @param instructionsId
+     * @return
+     */
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "instructionsId", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getShipmentInstructions/{instructionsId}")
+    public RESTfulResult getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId){
+        List<Map<String,Object>> map = omsshipShipmentInstructionsService.selectShipmentInstructions(instructionsId);
+        return success(map);
+    }
+
+    /**
+     * 修改
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @ApiOperation(value="更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "omsshipShipmentInstructions", value = "详细实体omsshipShipmentInstructions", required = true, dataType = "OmsshipShipmentInstructions")
+    })
+    @PostMapping(value = "/updateShipmentInstructions")
+    public RESTfulResult updateShipmentInstructions(@RequestBody OmsshipShipmentInstructions omsshipShipmentInstructions){
+        int code = omsshipShipmentInstructionsService.updateByPrimaryKey(omsshipShipmentInstructions);
+        return success(code);
+    }
+
+    /**
+     * 删除
+     * @param instructionsId
+     * @return
+     */
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "BigDecimal", name = "instructionsId", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteByPrimaryKey/{instructionsId}")
+    public RESTfulResult deleteByPrimaryKey(@PathVariable("instructionsId") BigDecimal instructionsId){
+        omsshipShipmentInstructionsService.deleteByPrimaryKey(instructionsId);
+        return success();
+    }
+
+    /**
+     * 展示所有装船指令
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示装船指令表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "74", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getShipMentInstructionsList")
+    public RESTfulResult getShipMentInstructionsList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer apiId){
+        List<Map<String,Object>> list = omsshipShipmentInstructionsService.selectAll(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = omsshipShipmentInstructionsService.selectAll(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    /**
+     * 修改下发状态
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @ApiOperation(value="修改下发状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "shipmentInstructionsId", value = "主键id", required = true, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "/updateIssueStatus/{shipmentInstructionsId}")
+    public RESTfulResult updateIssueStatus(@PathVariable("shipmentInstructionsId") BigDecimal shipmentInstructionsId){
+        int code = omsshipShipmentInstructionsService.updateIssueStatus(shipmentInstructionsId);
+        return success(code);
+    }
+
+    /**
+     * 获取批次id
+     * @return
+     */
+    @GetMapping("getBatchId")
+    @ApiOperation(value = "获取批次id下拉列表")
+    public RESTfulResult getBatchId(){
+        return success(omsshipShipmentInstructionsService.getBatchId());
+    }
+
+}

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

@@ -0,0 +1,147 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipBargeOperation;
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.service.ITmsshipBargeOperationService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipBargeOperation RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 04:04
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipBargeOperation RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipbargeoperations")
+public class TmsshipBargeOperationController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsshipBargeOperationService tmsshipBargeOperationService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+    /**
+     * 新增驳船作业
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增驳船作业", notes="根据TmsshipBargeOperation对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map",value = "驳船作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/addBargeOperation")
+    public RESTfulResult addBargeOperation(@RequestBody Map<String,Object> map) {
+        int code = tmsshipBargeOperationService.insertBargeOperation(map);
+        return success(code);
+    }
+
+
+    /**
+     * 修改驳船作业信息
+     * @param tmsshipBargeOperation
+     * @return
+     */
+    @ApiOperation(value="修改驳船作业信息", notes="根据TmsshipBargeOperation对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipBargeOperation",value = "驳船作业字段",required = true,paramType = "TmsshipBargeOperation")
+    })
+    @PostMapping("/updateBargeOperation")
+    public RESTfulResult updateBargeOperation(@RequestBody TmsshipBargeOperation tmsshipBargeOperation) {
+        int code = tmsshipBargeOperationService.updateBargeOperation(tmsshipBargeOperation);
+        return success(code);
+    }
+
+    /**
+     * 逻辑删除驳船作业信息
+     * @param bargeOperationId
+     * @return
+     */
+    @ApiOperation(value="删除驳船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bargeOperationId",value = "驳船作业字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteBargeOperation/{bargeOperationId}")
+    public RESTfulResult deleteBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        int code = tmsshipBargeOperationService.deleteBargeOperation(bargeOperationId);
+        return success(code);
+    }
+
+    /**
+     * 查询驳船作业信息
+     * @param bargeOperationId
+     * @return
+     */
+    @ApiOperation(value="查询驳船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bargeOperationId",value = "主键",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/selectBargeOperation/{bargeOperationId}")
+    public RESTfulResult selectBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        TmsshipBargeOperation tmsshipBargeOperation = tmsshipBargeOperationService.selectBargeOperation(bargeOperationId);
+        return success(tmsshipBargeOperation);
+    }
+
+    /**
+     * 查询驳船作业信息
+     * @param bargeOperationId
+     * @return
+     */
+    @ApiOperation(value="查询位置作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "bargeOperationId",value = "主键",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/getBargeOperation/{bargeOperationId}")
+    public RESTfulResult getBargeOperation(@PathVariable("bargeOperationId") BigDecimal bargeOperationId) {
+        List<Map<String,Object>> map = tmsshipBargeOperationService.getBargeOperation(bargeOperationId);
+        return success(map);
+    }
+
+    /**
+     * 展示驳船作业信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示驳船作业信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "61", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getBargeOperationList")
+    public RESTfulResult getBargeOperationList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId){
+        List<Map<String,Object>> list = tmsshipBargeOperationService.selectBargeOperationList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipBargeOperationService.selectBargeOperationList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+}

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

@@ -0,0 +1,50 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+import com.steerinfo.dil.service.ITmsshipEntryWharyResultService;
+import com.steerinfo.dil.service.impl.TmsshipEntryWharyResultServiceImpl;
+import com.steerinfo.dil.service.impl.TmsshipTotalResultServiceImpl;
+import com.steerinfo.dil.util.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.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.time.LocalDate;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * 装船实绩
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipentrywharyresults")
+public class TmsshipEntryWharyResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsshipEntryWharyResultServiceImpl tmsshipEntryWharyResultService;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+
+    /**
+     * 新增抵达实绩
+     * @param mapVal
+     * @return
+     */
+    @ApiOperation(value="新增抵达实绩", notes="根据TmsshipEntryWharyResult对象创建")
+    @ApiImplicitParam(name = "mapVal", value = "mapVal", required = true, dataType = "java.util.Map")
+    @PostMapping(value = "/addTmsShipEntryWharyResult")
+    public RESTfulResult addTmsShipEntryWharyResult(@RequestBody Map<String,Object> mapVal){
+        int code = tmsshipEntryWharyResultService.insertEntryWharyResult(mapVal);
+        return success(code);
+    }
+
+
+}

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

@@ -0,0 +1,149 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.service.ITmsshipLoadShipResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipLoadShipResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:47
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipLoadShipResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshiploadshipresults")
+public class TmsshipLoadShipResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsshipLoadShipResultService tmsshipLoadShipResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 新增装船作业(附带新增装船卸船)
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增装船作业", notes="根据TmsshipLoadShipResult对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map",value = "装船作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/addLoadShip")
+    public RESTfulResult addLoadShip(@RequestBody Map<String,Object> map) {
+        int code = tmsshipLoadShipResultService.insertLoadShip(map);
+        return success(code);
+    }
+
+
+    /**
+     * 修改装船作业信息
+     * @param tmsshipLoadShipResult
+     * @return
+     */
+    @ApiOperation(value="修改装船作业信息", notes="根据TmsshipLoadShipResult对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipLoadShipResult",value = "装船作业字段",required = true,paramType = "TmsshipLoadShipResult")
+    })
+    @PostMapping("/updateLoadShip")
+    public RESTfulResult updateLoadShip(@RequestBody TmsshipLoadShipResult tmsshipLoadShipResult) {
+        int code = tmsshipLoadShipResultService.updateLoadShip(tmsshipLoadShipResult);
+        return success(code);
+    }
+
+    /**
+     * 删除装船作业信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="删除装船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "装船作业字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteLoadShip/{resultId}")
+    public RESTfulResult deleteLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        int code = tmsshipLoadShipResultService.deleteLoadShip(resultId);
+        return success(code);
+    }
+
+    /**
+     * 查询位置作业信息
+     * @param reusltId
+     * @return
+     */
+    @ApiOperation(value="查询位置作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "reusltId",value = "位置作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/selectLoadShip/{reusltId}")
+    public RESTfulResult selectLoadShip(@PathVariable("reusltId") BigDecimal reusltId) {
+        TmsshipLoadShipResult tmsshipLoadShipResult = tmsshipLoadShipResultService.selectLoadShip(reusltId);
+        return success(tmsshipLoadShipResult);
+    }
+
+    /**
+     * 查询装船作业表单
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="查询装船作业表单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "位置作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/getLoadShip/{resultId}")
+    public RESTfulResult getLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        List<Map<String,Object>> tmsshipLoadShipResult = tmsshipLoadShipResultService.getLoadShip(resultId);
+        return success(tmsshipLoadShipResult);
+    }
+
+    /**
+     * 展示装船作业信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示装船作业信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "63", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getLoadShipList")
+    public RESTfulResult getLoadShipList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId){
+        List<Map<String,Object>> list = tmsshipLoadShipResultService.selectLoadShipList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipLoadShipResultService.selectLoadShipList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+}

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

@@ -0,0 +1,46 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+import com.steerinfo.dil.model.TmsshipOutWharyResult;
+import com.steerinfo.dil.service.ITmsshipOutWharyResultService;
+import com.steerinfo.dil.service.impl.TmsshipOutWharyResultServiceImpl;
+import com.steerinfo.dil.util.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.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.time.LocalDate;
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * 离岗实绩
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipoutwharyresults")
+public class TmsshipOutWharyResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsshipOutWharyResultServiceImpl tmsshipOutWharyResultService;
+
+    /**
+     * 新增离港实绩
+     * @param mapVal
+     * @return
+     */
+    @ApiOperation(value="新增离港实绩", notes="根据TmsShipOutWharyResult对象创建")
+    @ApiImplicitParam(name = "mapVal", value = "mapVal", required = true, dataType = "java.util.Map")
+    @PostMapping(value = "/addTmsShipOutWharyResult")
+    public RESTfulResult addTmsShipOutWharyResult(@RequestBody Map<String,Object> mapVal){
+        int code = tmsshipOutWharyResultService.insertOutWharyResult(mapVal);
+        return success(code);
+    }
+
+}

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

@@ -0,0 +1,152 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.service.ITmsshipShipLocationService;
+import com.steerinfo.dil.service.impl.TmsshipShipLocationServiceImpl;
+import com.steerinfo.dil.service.impl.TmsshipTotalResultServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipShipLocation RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:52
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipShipLocation RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipshiplocations")
+public class TmsshipShipLocationController extends BaseRESTfulController {
+
+    @Autowired
+    TmsshipShipLocationServiceImpl tmsshipShipLocationService;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+
+    /**
+     * 新增位置作业
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增位置作业", notes="根据TmsshipShipLocation对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map",value = "位置作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/addShipLocation")
+    public RESTfulResult addShipLocation(@RequestBody Map<String,Object> map) {
+        int code = tmsshipShipLocationService.addShipLocation(map);
+        return success(code);
+    }
+
+
+    /**
+     * 修改位置作业信息
+     * @param tmsshipShipLocation
+     * @return
+     */
+    @ApiOperation(value="修改位置作业信息", notes="根据TmsshipShipLocation对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipShipLocation",value = "位置作业字段",required = true,paramType = "TmsshipShipLocation")
+    })
+    @PostMapping("/updateShipLocation")
+    public RESTfulResult updateShipLocation(@RequestBody TmsshipShipLocation tmsshipShipLocation) {
+        int code = tmsshipShipLocationService.updateShipLocation(tmsshipShipLocation);
+        return success(code);
+    }
+
+    /**
+     * 删除位置作业信息
+     * @param locationId
+     * @return
+     */
+    @ApiOperation(value="删除位置作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "locationId",value = "位置作业字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteShipLocation/{locationId}")
+    public RESTfulResult deleteShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        int code = tmsshipShipLocationService.deleteShipLocation(locationId);
+        return success(code);
+    }
+
+    /**
+     * 查询位置作业信息
+     * @param locationId
+     * @return
+     */
+    @ApiOperation(value="查询位置作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapVal",value = "位置作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/selectShipLocation/{locationId}")
+    public RESTfulResult selectShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        TmsshipShipLocation tmsshipShipLocation = tmsshipShipLocationService.selectShipLocation(locationId);
+        return success(tmsshipShipLocation);
+    }
+
+    /**
+     * 查询位置作业信息
+     * @param locationId
+     * @return
+     */
+    @ApiOperation(value="查询位置作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapVal",value = "位置作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/getShipLocation/{locationId}")
+    public RESTfulResult getShipLocation(@PathVariable("locationId") BigDecimal locationId) {
+        List<Map<String,Object>> map = tmsshipShipLocationService.getShipLocation(locationId);
+        return success(map);
+    }
+
+    /**
+     * 展示位置作业信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示位置作业信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "59", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getShipLocationList")
+    public RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId){
+        List<Map<String,Object>> list = tmsshipShipLocationService.selectShipLocationList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipShipLocationService.selectShipLocationList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+}

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

@@ -0,0 +1,105 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.model.TmsshipTotalResult;
+import com.steerinfo.dil.service.ITmsshipTotalResultService;
+import com.steerinfo.dil.service.impl.TmsshipTotalResultServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipTotalResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:55
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipTotalResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshiptotalresults")
+public class TmsshipTotalResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 展示水路货物运单列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示水路货物运单", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "apiId", value = "56", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/listAllOrders")
+    public RESTfulResult listAllOrders(@RequestBody(required = false) Map<String,Object> mapVal,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId){
+        List<Map<String,Object>> list = tmsshipTotalResultService.getOrderList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipTotalResultService.getOrderList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    /**
+     * 展示船只信息
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示船只信息", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "138", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getCapacityList")
+    public RESTfulResult getCapacityList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       Integer apiId){
+        List<Map<String,Object>> list = tmsshipTotalResultService.getCapacity(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipTotalResultService.getCapacity(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+
+}

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

@@ -0,0 +1,149 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.model.TmsshipUnloadShipResult;
+import com.steerinfo.dil.service.ITmsshipUnloadShipResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipUnloadShipResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:57
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipUnloadShipResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipunloadshipresults")
+public class TmsshipUnloadShipResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsshipUnloadShipResultService tmsshipUnloadShipResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 新增卸船作业
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增卸船作业", notes="根据TmsshipUnloadShipResult对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map",value = "卸船作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/addUnLoadShip")
+    public RESTfulResult addUnLoadShip(@RequestBody Map<String,Object> map) {
+        int code = tmsshipUnloadShipResultService.insertUnloadShip(map);
+        return success(code);
+    }
+
+
+    /**
+     * 修改卸船作业信息
+     * @param tmsshipUnloadShipResult
+     * @return
+     */
+    @ApiOperation(value="修改卸船作业信息", notes="根据TmsshipUnloadShipResult对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipUnloadShipResult",value = "卸船作业字段",required = true,paramType = "TmsshipUnloadShipResult")
+    })
+    @PostMapping("/updateUnLoadShip")
+    public RESTfulResult updateUnLoadShip(@RequestBody TmsshipUnloadShipResult tmsshipUnloadShipResult) {
+        int code = tmsshipUnloadShipResultService.updateUnloadShip(tmsshipUnloadShipResult);
+        return success(code);
+    }
+
+    /**
+     * 删除卸船作业信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="删除卸船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "卸船作业字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteUnLoadShip/{resultId}")
+    public RESTfulResult deleteUnLoadShip(@PathVariable("resultId") BigDecimal resultId) {
+        int code = tmsshipUnloadShipResultService.deleteUnloadShip(resultId);
+        return success(code);
+    }
+
+    /**
+     * 查询卸船作业信息
+     * @param reusltId
+     * @return
+     */
+    @ApiOperation(value="查询卸船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "reusltId",value = "卸船作业字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/selectUnLoadShip/{reusltId}")
+    public RESTfulResult selectUnLoadShip(@PathVariable("reusltId") BigDecimal reusltId) {
+        TmsshipUnloadShipResult tmsshipUnloadShipResult = tmsshipUnloadShipResultService.selectUnloadShip(reusltId);
+        return success(tmsshipUnloadShipResult);
+    }
+
+    /**
+     * 查询卸船作业信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="查询卸船作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "卸船作业字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/getUnloadShip/{resultId}")
+    public RESTfulResult getUnloadShip(@PathVariable("resultId") BigDecimal resultId) {
+        List<Map<String,Object>> tmsshipUnloadShipResult = tmsshipUnloadShipResultService.getUnloadShip(resultId);
+        return success(tmsshipUnloadShipResult);
+    }
+
+    /**
+     * 展示卸船作业信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示卸船作业信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "68", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getUnLoadShipList")
+    public RESTfulResult getUnLoadShipList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId){
+        List<Map<String,Object>> list = tmsshipUnloadShipResultService.selectUnloadShipList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipUnloadShipResultService.selectUnloadShipList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+}

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

@@ -0,0 +1,149 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.model.TmsshipWaterQualityResult;
+import com.steerinfo.dil.service.ITmsshipWaterQualityResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import 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;
+
+/**
+ * TmsshipWaterQualityResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 09:01
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipWaterQualityResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsshipwaterqualityresults")
+public class TmsshipWaterQualityResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsshipWaterQualityResultService tmsshipWaterQualityResultService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 新增水分质检作业
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增水分质检作业", notes="根据TmsshipWaterQualityResult对象创建")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map",value = "水分质检字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/addWaterQualityResult")
+    public RESTfulResult addWaterQualityResult(@RequestBody Map<String,Object> map) {
+        int code = tmsshipWaterQualityResultService.insertWaterQualityResult(map);
+        return success(code);
+    }
+
+
+    /**
+     * 修改水分质检作业信息
+     * @param tmsshipWaterQualityResult
+     * @return
+     */
+    @ApiOperation(value="修改水分质检信息", notes="根据tmsshipWaterQualityResult对象修改")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tmsshipWaterQualityResult",value = "水分质检字段",required = true,paramType = "TmsshipLoadShipResult")
+    })
+    @PostMapping("/updateWaterQualityResult")
+    public RESTfulResult updateWaterQualityResult(@RequestBody TmsshipWaterQualityResult tmsshipWaterQualityResult) {
+        int code = tmsshipWaterQualityResultService.updateWaterQualityResult(tmsshipWaterQualityResult);
+        return success(code);
+    }
+
+    /**
+     * 删除水分质检信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="删除水分质检信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "水分质检字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/deleteWaterQualityResult/{resultId}")
+    public RESTfulResult deleteWaterQualityResult(@PathVariable("resultId") BigDecimal resultId) {
+        int code = tmsshipWaterQualityResultService.deleteWaterQualityResult(resultId);
+        return success(code);
+    }
+
+    /**
+     * 查询水分质检信息
+     * @param reusltId
+     * @return
+     */
+    @ApiOperation(value="查询水分质检信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "reusltId",value = "水分质检字段",required = true,paramType = "java.util.Map")
+    })
+    @PostMapping("/selectWaterQualityResult/{reusltId}")
+    public RESTfulResult selectWaterQualityResult(@PathVariable("reusltId") BigDecimal reusltId) {
+        TmsshipWaterQualityResult tmsshipWaterQualityResult = tmsshipWaterQualityResultService.selectWaterQualityResult(reusltId);
+        return success(tmsshipWaterQualityResult);
+    }
+
+    /**
+     * 查询水分质检信息
+     * @param resultId
+     * @return
+     */
+    @ApiOperation(value="查询水分质检信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId",value = "水分质检字段",required = true,paramType = "BigDecimal")
+    })
+    @PostMapping("/getWaterQuality/{resultId}")
+    public RESTfulResult getWaterQuality(@PathVariable("resultId") BigDecimal resultId) {
+        List<Map<String,Object>> tmsshipWaterQualityResult = tmsshipWaterQualityResultService.getWaterQuality(resultId);
+        return success(tmsshipWaterQualityResult);
+    }
+
+    /**
+     * 展示水分质检信息列表
+     * @param mapVal
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="展示水分质检信息列表", notes="分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "67", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getWaterQualityResultList")
+    public RESTfulResult getWaterQualityResultList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId){
+        List<Map<String,Object>> list = tmsshipWaterQualityResultService.selectWaterQualityList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = tmsshipWaterQualityResultService.selectWaterQualityList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+}

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

@@ -0,0 +1,19 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+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
+ */
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "192.168.0.102:8083")
+public interface ColumnDataFeign {
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+}

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

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/2 10:52
+ * @Version 1.0
+ */
+@Service
+@FeignClient(value = "TMS-DEV",url = "10.244.67.48:80")
+public interface TmsDevFeign {
+    @RequestMapping("/getResult")
+    List<Map<String,Object>> getResult(Integer resultId);
+    @PostMapping("/api/v1/tms/transportOrderResult/orderTransportResultByTotalId/{totalId}")
+    public List<Map<String,Object>> getOrderResultByTotal(@PathVariable("totalId") BigDecimal totalId);
+}

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

@@ -0,0 +1,26 @@
+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.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
+ */
+@FeignClient(value = "dil-wsmh-api",url = "192.168.0.100:8070")
+public interface WmshboundFeign {
+
+    @PostMapping("api/v1/wmsh/wmshinboundresults/addWarehousingResult")
+    RESTfulResult addWarehousingResult(@RequestBody(required = false) Map<String,Object> wmshInboundResult);
+
+    @PostMapping("api/v1/wmsh/wmshoutboundresults/addResult")
+    RESTfulResult addResult(@RequestBody(required = false) Map<String,Object> map);
+}

src/main/java/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.java

@@ -0,0 +1,26 @@
+package com.steerinfo.dil.interceptors;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ReloadableResourceBundleMessageSource;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
+import org.springframework.web.servlet.i18n.SessionLocaleResolver;
+
+import java.util.Locale;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/4/23 8:19
+ * @Version 1.0
+ */
+
+@Configuration
+public class MyLocaleChangeInterceptor {
+
+    //国际化配置
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor(){
+        return new LocaleChangeInterceptor();
+    }
+
+}

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

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AmsshipCargoTransferResultMapper extends IBaseMapper<AmsshipCargoTransferResult, BigDecimal> {
+
+    List<Map<String,Object>> seletCargoTransfer(Map<String,Object> mapVal);
+    //添加货权转移信息
+    int insertSelective(AmsshipCargoTransferResult amsshipCargoTransferResult);
+    //删除货权转移信息
+//    int deleteByPrimaryKey(BigDecimal cargoTransferResultId);
+    //修改货权转移信息
+    int updateByPrimaryKey(BigDecimal cargoTransferResultId);
+    BigDecimal selectMaxId();
+    //  根据关键字查找信息
+    AmsshipCargoTransferResult selectByPrimaryKey(BigDecimal cargoTransferResultId);
+    List<Map<String,Object>> getGroup();
+    List<Map<String,Object>> getCargoId();
+    List<Map<String,Object>> selectByOrder(Integer cargoTransferResultId);
+    //    List<Map<String,Object>>  updateByBatchId(Integer betchId);
+    List<Map<String,Object>>  insertBetchId( );
+
+    BigDecimal selectPortId(BigDecimal pierId);
+}

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

@@ -0,0 +1,52 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsshipDeliveryAttorneyMapper extends IBaseMapper<AmsshipDeliveryAttorney, BigDecimal> {
+    @MapKey("selectshipCargoTranferResult")
+    List<Map<String,Object>> selectshipCargoTranferResult(Map<String,Object> mapVal);
+    //添加提货委托信息
+//    int insert(AmsshipDeliveryAttorney amsshipDeliveryAttorney);
+    //删除提货委托信息
+    int deleteByPrimaryKey(BigDecimal attorneyId);
+    //修改提货委托信息
+    int updateByPrimaryKey(BigDecimal attorneyId);
+    BigDecimal selectMaxId();
+    //  根据关键字查找信息
+    AmsshipDeliveryAttorney selectByPrimaryKey(BigDecimal attorneyId);
+    List<Map<String,Object>> getPortName();
+    List<Map<String,Object>> getNoticeId();
+    List<Map<String,Object>> getDeliveryAttorneyId(Integer attorneyId);
+    /**
+     * 查询AttorneyId
+     * @return
+     */
+    List<Map<String, Object>> getAttorneyId();
+
+    /**
+     * 查询PortId
+     * @return
+     */
+    List<Map<String, Object>> getPortId();
+
+    /**
+     * 查询PierId
+     * @return
+     */
+    List<Map<String, Object>> getPierId();
+
+    /**
+     * 仓库id
+     * @return
+     */
+    List<Map<String, Object>> getRmRawId();
+}

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

@@ -0,0 +1,31 @@
+package com.steerinfo.dil.mapper;
+
+
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AmsshipDeliveryNoticeMapper extends IBaseMapper<AmsshipDeliveryNotice, BigDecimal> {
+    @MapKey("selectShipDeliveryNotice")
+        // 展示收货通知单信息
+    List<Map<String,Object>> selectShipDeliveryNotice(Map<String,Object> mapVal);
+    //修改收货通知单信息
+    int updateByPrimaryKey(BigDecimal noticeId);
+    BigDecimal selectMaxId();
+    AmsshipDeliveryNotice selectByPrimaryKey(BigDecimal noticeId);
+    @MapKey("getResultNumber")
+    List<Map<String,Object>> getResultNumber();
+    @MapKey("getcarrier")
+    List<Map<String,Object>>  getcarrier();
+    //     List<Map<String,Object>>  getOrderNo();
+    @MapKey("selectByNoticeId")
+    List<Map<String,Object>> selectByNoticeId(Integer noticeId);
+    @MapKey("getShipper")
+    List<Map<String,Object>>  getShipper();
+}

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

@@ -0,0 +1,56 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OmsshipInstructionsCapacityMapper extends IBaseMapper<OmsshipInstructionsCapacity, BigDecimal> {
+    /**
+     * 查询orderId
+     * @return
+     */
+    List<Map<String, Object>> selectOrderId();
+
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insert(OmsshipInstructionsCapacity omsshipInstructionsCapacity);
+
+    // 根据主键删除
+    int deleteByPrimaryKey(BigDecimal instructionsCapacityId);
+
+
+    //根据主键查看详细
+    OmsshipInstructionsCapacity selectByPrimaryKey(BigDecimal instructionsCapacityId);
+
+
+    // 根据主键修改
+    int updateByPrimaryKeySelective(OmsshipInstructionsCapacity omsshipInstructionsCapacity);
+
+
+    /**
+     * 查询所有船只
+     * @return
+     */
+    List<Map<String,Object>> selectCapacities(Map<String,Object> mapVal);
+
+    /**
+     * 得到运力id
+     * @return
+     */
+    List<Map<String,Object>> selectCapacityId();
+
+    /**
+     * 查询表单信息
+     * @param instructionsCapacityId
+     * @return
+     */
+    List<Map<String,Object>> selectInstructionsCapacity(BigDecimal instructionsCapacityId);
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OmsshipShipmentInstructionsMapper extends IBaseMapper<OmsshipShipmentInstructions, BigDecimal> {
+    List<Map<String,Object>> selectAll(Map<String,Object> mapVal);
+    int deleteByPrimaryKey(BigDecimal shipmentInstructionsId);
+    int insert(OmsshipShipmentInstructions omsshipShipmentInstructions);
+    int updateByPrimaryKeySelective(OmsshipShipmentInstructions omsshipShipmentInstructions);
+    //   得到最大id
+    BigDecimal selectMaxId();
+    List<Map<String,Object>> selectShipmentInstructions(BigDecimal shipmentInstructionsId);
+    List<Map<String,Object>> getBatchId();
+}

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

@@ -0,0 +1,37 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipBargeOperation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipBargeOperationMapper extends IBaseMapper<TmsshipBargeOperation, BigDecimal> {
+
+    // 得到最大id
+    BigDecimal selectMaxId();
+
+    // 新增驳船作业
+    int insert(TmsshipBargeOperation tmsshipBargeOperation);
+
+    // 查询驳船作业
+    TmsshipBargeOperation selectByPrimaryKey(BigDecimal bargeOperationId);
+
+    // 删除驳船作业
+    int deleteByPrimaryKey(BigDecimal bargeOperationId);
+
+    // 修改驳船作业
+    int updateByPrimaryKeySelective(TmsshipBargeOperation tmsshipBargeOperation);
+
+    List<Map<String,Object>> selectBargeOperationList(Map<String,Object> mapVal);
+
+    /**
+     * 查询表单信息
+     * @param bargeOperationId
+     * @return
+     */
+    List<Map<String,Object>> selectBargeOperation(BigDecimal bargeOperationId);
+}

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

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipEntryWharyResultMapper extends IBaseMapper<TmsshipEntryWharyResult, BigDecimal> {
+
+    // 得到最大id
+    BigDecimal selectMaxId();
+}

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

@@ -0,0 +1,52 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShipResult, BigDecimal> {
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insert(TmsshipLoadShipResult tmsshipLoadShipResult);
+
+    // 根据主键删除
+    int deleteByPrimaryKey(BigDecimal resultId);
+
+
+    //根据主键查看详细
+    TmsshipLoadShipResult selectByPrimaryKey(BigDecimal resultId);
+
+
+    // 根据主键修改
+    int updateByPrimaryKeySelective(TmsshipLoadShipResult tmsshipLoadShipResult);
+
+
+    /**
+     * 查询所有装船
+     * @return
+     */
+    List<Map<String,Object>> selectLoadShipList(Map<String,Object> mapVal);
+
+    // 查询总重量
+    BigDecimal selectAllWeight(BigDecimal instructionsId);
+
+    /**
+     * 查询装船表单
+     * @return
+     */
+    List<Map<String,Object>> selectLoadShip(BigDecimal resultId);
+
+    // 根据外轮船名和物资名称得到批次id
+    BigDecimal getBatchId(Map<String,Object> mapVal);
+
+    @Override
+    List<TmsshipLoadShipResult> selectByParameters(Map<String, Object> totalId);
+}

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

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipOutWharyResult;
+import com.steerinfo.dil.model.TmsshipTotalResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipOutWharyResultMapper extends IBaseMapper<TmsshipOutWharyResult, BigDecimal> {
+
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入驶离实绩
+    int insert(TmsshipTotalResult tmsshipTotalResult);
+}

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

@@ -0,0 +1,44 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipShipLocationMapper extends IBaseMapper<TmsshipShipLocation, BigDecimal> {
+
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insert(TmsshipShipLocation tmsshipShipLocation);
+
+    // 根据主键删除
+    int deleteByPrimaryKey(BigDecimal locationId);
+
+
+    //根据主键查看详细
+    TmsshipShipLocation selectByPrimaryKey(BigDecimal locationId);
+
+
+    // 根据主键修改
+    int updateByPrimaryKeySelective(TmsshipShipLocation tmsshipShipLocation);
+
+
+    /**
+     * 查询所有作业位置
+     * @return
+     */
+    List<Map<String,Object>> selectShipLocationList(Map<String,Object> mapVal);
+
+    /**
+     * 查询位置作业表单数据
+     * @param locationId
+     * @return
+     */
+    List<Map<String,Object>> selectShipLocation(BigDecimal locationId);
+}

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipTotalResult;
+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.Param;
+
+@Mapper
+public interface TmsshipTotalResultMapper extends IBaseMapper<TmsshipTotalResult, BigDecimal> {
+    // 得到总实绩的最大id
+    BigDecimal selectMaxId();
+
+    // 插入总实绩id
+    int insert(TmsshipTotalResult tmsshipTotalResult);
+
+    // 得到总实绩id
+    BigDecimal selectResultTotalId(BigDecimal orderId);
+
+    // 展示水路货物运单
+    List<Map<String, Object>> selectOrderList(Map<String, Object> mapVal);
+
+    // 得到船信息
+    List<Map<String, Object>> getCapacity(Map<String, Object> mapVal);
+}

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

@@ -0,0 +1,43 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipUnloadShipResult;
+import com.steerinfo.dil.model.TmsshipWaterQualityResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipUnloadShipResultMapper extends IBaseMapper<TmsshipUnloadShipResult, BigDecimal> {
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insert(TmsshipUnloadShipResult tmsshipUnloadShipResult);
+
+    // 根据主键删除
+    int deleteByPrimaryKey(BigDecimal resultId);
+
+
+    //根据主键查看详细
+    TmsshipUnloadShipResult selectByPrimaryKey(BigDecimal resultId);
+
+
+    // 根据主键修改
+    int updateByPrimaryKeySelective(TmsshipUnloadShipResult tmsshipUnloadShipResult);
+
+
+    /**
+     * 查询所有卸船作业信息
+     * @return
+     */
+    List<Map<String,Object>> selectUnloadShipList(Map<String,Object> mapVal);
+
+    /**
+     * 查询卸船表单信息
+     * @return
+     */
+    List<Map<String,Object>> selectUnloadShip(BigDecimal resultId);
+}

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

@@ -0,0 +1,56 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.model.TmsshipWaterQualityResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmsshipWaterQualityResultMapper extends IBaseMapper<TmsshipWaterQualityResult, BigDecimal> {
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insert(TmsshipWaterQualityResult tmsshipWaterQualityResult);
+
+    // 根据主键删除
+    int deleteByPrimaryKey(BigDecimal resultId);
+
+
+    //根据主键查看详细
+    TmsshipWaterQualityResult selectByPrimaryKey(BigDecimal resultId);
+
+
+    // 根据主键修改
+    int updateByPrimaryKeySelective(TmsshipWaterQualityResult tmsshipWaterQualityResult);
+
+
+    /**
+     * 查询所有水分检测信息
+     * @return
+     */
+    List<Map<String,Object>> selectWaterQualityList(Map<String,Object> mapVal);
+
+    /**
+     * 查询所有水分检测表单
+     * @return
+     */
+    List<Map<String,Object>> selectWaterQuality(BigDecimal resultId);
+
+    /**
+     * 通过总实绩id获得实际装载重量
+     * @param totalResultId
+     * @return
+     */
+    BigDecimal selectRealWeight(BigDecimal totalResultId);
+
+    /**
+     * 根据子表id查询指令id
+     * @param orderId
+     */
+    BigDecimal selectInstructionsId(BigDecimal orderId);
+}

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

@@ -0,0 +1,303 @@
+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 AmsshipCargoTransferResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID(CARGO_TRANSFER_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID",required=true)
+    private BigDecimal cargoTransferResultId;
+
+    /**
+     * 货权转移编号(RESULT_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="货权转移编号",required=false)
+    private String resultNumber;
+
+    /**
+     * 货权转移送达单位(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="货权转移送达单位",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 联系人(RESULT_CONTACT_PERSON,VARCHAR,20)
+     */
+    @ApiModelProperty(value="联系人",required=false)
+    private String resultContactPerson;
+
+    /**
+     * 联系电话/传真(RESULT_TELEPHONE_FAX,VARCHAR,50)
+     */
+    @ApiModelProperty(value="联系电话/传真",required=false)
+    private String resultTelephoneFax;
+
+    /**
+     * 收货人ID(GROUP_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="收货人ID",required=false)
+    private BigDecimal groupId;
+
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="批次ID",required=false)
+    private BigDecimal batchId;
+
+    /**
+     * 放货数量(RESULT_NUMBER_OF_LOANS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="放货数量",required=false)
+    private BigDecimal resultNumberOfLoans;
+
+    /**
+     * 货代信息(RESULT_FREIGHT_FORWARDING_INFO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="货代信息",required=false)
+    private String resultFreightForwardingInfo;
+
+    /**
+     * 说明(RESULT_MEMO,VARCHAR,128)
+     */
+    @ApiModelProperty(value="说明",required=false)
+    private String resultMemo;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 是否删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.cargoTransferResultId;
+    }
+
+    @Override
+    public void setId(BigDecimal cargoTransferResultId) {
+        this.cargoTransferResultId = cargoTransferResultId;
+    }
+
+    public BigDecimal getCargoTransferResultId() {
+        return cargoTransferResultId;
+    }
+
+    public void setCargoTransferResultId(BigDecimal cargoTransferResultId) {
+        this.cargoTransferResultId = cargoTransferResultId;
+    }
+
+    public String getResultNumber() {
+        return resultNumber;
+    }
+
+    public void setResultNumber(String resultNumber) {
+        this.resultNumber = resultNumber == null ? null : resultNumber.trim();
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getResultContactPerson() {
+        return resultContactPerson;
+    }
+
+    public void setResultContactPerson(String resultContactPerson) {
+        this.resultContactPerson = resultContactPerson == null ? null : resultContactPerson.trim();
+    }
+
+    public String getResultTelephoneFax() {
+        return resultTelephoneFax;
+    }
+
+    public void setResultTelephoneFax(String resultTelephoneFax) {
+        this.resultTelephoneFax = resultTelephoneFax == null ? null : resultTelephoneFax.trim();
+    }
+
+    public BigDecimal getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(BigDecimal groupId) {
+        this.groupId = groupId;
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public BigDecimal getResultNumberOfLoans() {
+        return resultNumberOfLoans;
+    }
+
+    public void setResultNumberOfLoans(BigDecimal resultNumberOfLoans) {
+        this.resultNumberOfLoans = resultNumberOfLoans;
+    }
+
+    public String getResultFreightForwardingInfo() {
+        return resultFreightForwardingInfo;
+    }
+
+    public void setResultFreightForwardingInfo(String resultFreightForwardingInfo) {
+        this.resultFreightForwardingInfo = resultFreightForwardingInfo == null ? null : resultFreightForwardingInfo.trim();
+    }
+
+    public String getResultMemo() {
+        return resultMemo;
+    }
+
+    public void setResultMemo(String resultMemo) {
+        this.resultMemo = resultMemo == null ? null : resultMemo.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", cargoTransferResultId=").append(cargoTransferResultId);
+        sb.append(", resultNumber=").append(resultNumber);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", resultContactPerson=").append(resultContactPerson);
+        sb.append(", resultTelephoneFax=").append(resultTelephoneFax);
+        sb.append(", groupId=").append(groupId);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", resultNumberOfLoans=").append(resultNumberOfLoans);
+        sb.append(", resultFreightForwardingInfo=").append(resultFreightForwardingInfo);
+        sb.append(", resultMemo=").append(resultMemo);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,304 @@
+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 AmsshipDeliveryAttorney implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(ATTORNEY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal attorneyId;
+
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="批次ID",required=false)
+    private BigDecimal batchId;
+
+    /**
+     * 物流流向即到站港(PORT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物流流向即到站港",required=false)
+    private BigDecimal portId;
+
+    /**
+     * 提货单位（下游港口ID）(DOWN_SWIM_PORT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="提货单位（下游港口ID）",required=false)
+    private BigDecimal downSwimPortId;
+
+    /**
+     * 提货联系人(ATTORNEY_PICKUP_CONTACT_PERSON,VARCHAR,20)
+     */
+    @ApiModelProperty(value="提货联系人",required=false)
+    private String attorneyPickupContactPerson;
+
+    /**
+     * 提货人身份证号(ATTORENY_PICKUP_IDCARD,VARCHAR,50)
+     */
+    @ApiModelProperty(value="提货人身份证号",required=false)
+    private String attorenyPickupIdcard;
+
+    /**
+     * 联系电话(ATTORNEY_CONTACT_TELEPHONE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String attorneyContactTelephone;
+
+    /**
+     * 委托时间(ATTORNEY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="委托时间",required=false)
+    private Date attorneyTime;
+
+    /**
+     * PDF文件(ATTORNEY_PDFFILE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="PDF文件",required=false)
+    private String attorneyPdffile;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 是否删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除",required=false)
+    private Short deleted;
+
+    /**
+     * 下发状态(ATTORNEY_DISTRIBUTION_STATUS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="下发状态",required=false)
+    private String attorneyDistributionStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.attorneyId;
+    }
+
+    @Override
+    public void setId(BigDecimal attorneyId) {
+        this.attorneyId = attorneyId;
+    }
+
+    public BigDecimal getAttorneyId() {
+        return attorneyId;
+    }
+
+    public void setAttorneyId(BigDecimal attorneyId) {
+        this.attorneyId = attorneyId;
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public BigDecimal getPortId() {
+        return portId;
+    }
+
+    public void setPortId(BigDecimal portId) {
+        this.portId = portId;
+    }
+
+    public BigDecimal getDownSwimPortId() {
+        return downSwimPortId;
+    }
+
+    public void setDownSwimPortId(BigDecimal downSwimPortId) {
+        this.downSwimPortId = downSwimPortId;
+    }
+
+    public String getAttorneyPickupContactPerson() {
+        return attorneyPickupContactPerson;
+    }
+
+    public void setAttorneyPickupContactPerson(String attorneyPickupContactPerson) {
+        this.attorneyPickupContactPerson = attorneyPickupContactPerson == null ? null : attorneyPickupContactPerson.trim();
+    }
+
+    public String getAttorenyPickupIdcard() {
+        return attorenyPickupIdcard;
+    }
+
+    public void setAttorenyPickupIdcard(String attorenyPickupIdcard) {
+        this.attorenyPickupIdcard = attorenyPickupIdcard == null ? null : attorenyPickupIdcard.trim();
+    }
+
+    public String getAttorneyContactTelephone() {
+        return attorneyContactTelephone;
+    }
+
+    public void setAttorneyContactTelephone(String attorneyContactTelephone) {
+        this.attorneyContactTelephone = attorneyContactTelephone == null ? null : attorneyContactTelephone.trim();
+    }
+
+    public Date getAttorneyTime() {
+        return attorneyTime;
+    }
+
+    public void setAttorneyTime(Date attorneyTime) {
+        this.attorneyTime = attorneyTime;
+    }
+
+    public String getAttorneyPdffile() {
+        return attorneyPdffile;
+    }
+
+    public void setAttorneyPdffile(String attorneyPdffile) {
+        this.attorneyPdffile = attorneyPdffile == null ? null : attorneyPdffile.trim();
+    }
+
+    public String getAttorneyDistributionStatus() {
+        return attorneyDistributionStatus;
+    }
+
+    public void setAttorneyDistributionStatus(String attorneyDistributionStatus) {
+        this.attorneyDistributionStatus = attorneyDistributionStatus;
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Short getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Short 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(", attorneyId=").append(attorneyId);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", portId=").append(portId);
+        sb.append(", downSwimPortId=").append(downSwimPortId);
+        sb.append(", attorneyPickupContactPerson=").append(attorneyPickupContactPerson);
+        sb.append(", attorenyPickupIdcard=").append(attorenyPickupIdcard);
+        sb.append(", attorneyContactTelephone=").append(attorneyContactTelephone);
+        sb.append(", attorneyTime=").append(attorneyTime);
+        sb.append(", attorneyPdffile=").append(attorneyPdffile);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", attorneyDistributionStatus=").append(attorneyDistributionStatus);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,363 @@
+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 AmsshipDeliveryNotice implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(NOTICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal noticeId;
+
+    /**
+     * 委托单位ID(REQUESTER_GROUP_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="委托单位ID",required=false)
+    private BigDecimal requesterGroupId;
+
+    /**
+     * 承运单位ID(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运单位ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 贸易方式(NOTICE_COMMERCE_METHOD,VARCHAR,20)
+     */
+    @ApiModelProperty(value="贸易方式",required=false)
+    private String noticeCommerceMethod;
+
+    /**
+     * 交接方式(NOTICE_HANDOVER_METHOD,VARCHAR,20)
+     */
+    @ApiModelProperty(value="交接方式",required=false)
+    private String noticeHandoverMethod;
+
+    /**
+     * 发货港口(PORT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="发货港口",required=false)
+    private BigDecimal portId;
+
+    /**
+     * 港建费金额(NOTICE_PORT_CONSTRUCTION_FEE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="港建费金额",required=false)
+    private Short noticePortConstructionFee;
+
+    /**
+     * 放货时间(NOTICE_DELIVERY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="放货时间",required=false)
+    private Date noticeDeliveryTime;
+
+    /**
+     * 免堆天数(NOTICE_PILE_FREE_DAYS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="免堆天数",required=false)
+    private Short noticePileFreeDays;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 下发状态(NOTICE_DISTRIBUTION_STATUS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="下发状态",required=false)
+    private String noticeDistributionStatus;
+
+    /**
+     * 是否删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除",required=false)
+    private Short deleted;
+
+    /**
+     * 批次Id(BATCH_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="批次Id",required=false)
+    private Short batchId;
+
+    /**
+     * 单价（从采购合同中获取）(PURCHASE_CONTRACT_UNIT_PRICE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="单价（从采购合同中获取）",required=false)
+    private Short purchaseContractUnitPrice;
+
+    /**
+     * 合同水分（从采购合同中获取）(PURCHASE_CONTRACT_MOISTURE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="合同水分（从采购合同中获取）",required=false)
+    private String purchaseContractMoisture;
+
+    /**
+     * 品质指标（从采购合同中获取）(PURCHASE_CONTRACT_QUALITYINDEX,VARCHAR,20)
+     */
+    @ApiModelProperty(value="品质指标（从采购合同中获取）",required=false)
+    private String purchaseContractQualityindex;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.noticeId;
+    }
+
+    @Override
+    public void setId(BigDecimal noticeId) {
+        this.noticeId = noticeId;
+    }
+
+    public BigDecimal getNoticeId() {
+        return noticeId;
+    }
+
+    public void setNoticeId(BigDecimal noticeId) {
+        this.noticeId = noticeId;
+    }
+
+    public BigDecimal getRequesterGroupId() {
+        return requesterGroupId;
+    }
+
+    public void setRequesterGroupId(BigDecimal requesterGroupId) {
+        this.requesterGroupId = requesterGroupId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getNoticeCommerceMethod() {
+        return noticeCommerceMethod;
+    }
+
+    public void setNoticeCommerceMethod(String noticeCommerceMethod) {
+        this.noticeCommerceMethod = noticeCommerceMethod == null ? null : noticeCommerceMethod.trim();
+    }
+
+    public String getNoticeHandoverMethod() {
+        return noticeHandoverMethod;
+    }
+
+    public void setNoticeHandoverMethod(String noticeHandoverMethod) {
+        this.noticeHandoverMethod = noticeHandoverMethod == null ? null : noticeHandoverMethod.trim();
+    }
+
+    public BigDecimal getPortId() {
+        return portId;
+    }
+
+    public void setPortId(BigDecimal portId) {
+        this.portId = portId;
+    }
+
+    public Short getNoticePortConstructionFee() {
+        return noticePortConstructionFee;
+    }
+
+    public void setNoticePortConstructionFee(Short noticePortConstructionFee) {
+        this.noticePortConstructionFee = noticePortConstructionFee;
+    }
+
+    public Date getNoticeDeliveryTime() {
+        return noticeDeliveryTime;
+    }
+
+    public void setNoticeDeliveryTime(Date noticeDeliveryTime) {
+        this.noticeDeliveryTime = noticeDeliveryTime;
+    }
+
+    public Short getNoticePileFreeDays() {
+        return noticePileFreeDays;
+    }
+
+    public void setNoticePileFreeDays(Short noticePileFreeDays) {
+        this.noticePileFreeDays = noticePileFreeDays;
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getNoticeDistributionStatus() {
+        return noticeDistributionStatus;
+    }
+
+    public void setNoticeDistributionStatus(String noticeDistributionStatus) {
+        this.noticeDistributionStatus = noticeDistributionStatus == null ? null : noticeDistributionStatus.trim();
+    }
+
+    public Short getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Short deleted) {
+        this.deleted = deleted;
+    }
+
+    public Short getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(Short batchId) {
+        this.batchId = batchId;
+    }
+
+    public Short getPurchaseContractUnitPrice() {
+        return purchaseContractUnitPrice;
+    }
+
+    public void setPurchaseContractUnitPrice(Short purchaseContractUnitPrice) {
+        this.purchaseContractUnitPrice = purchaseContractUnitPrice;
+    }
+
+    public String getPurchaseContractMoisture() {
+        return purchaseContractMoisture;
+    }
+
+    public void setPurchaseContractMoisture(String purchaseContractMoisture) {
+        this.purchaseContractMoisture = purchaseContractMoisture == null ? null : purchaseContractMoisture.trim();
+    }
+
+    public String getPurchaseContractQualityindex() {
+        return purchaseContractQualityindex;
+    }
+
+    public void setPurchaseContractQualityindex(String purchaseContractQualityindex) {
+        this.purchaseContractQualityindex = purchaseContractQualityindex == null ? null : purchaseContractQualityindex.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", noticeId=").append(noticeId);
+        sb.append(", requesterGroupId=").append(requesterGroupId);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", noticeCommerceMethod=").append(noticeCommerceMethod);
+        sb.append(", noticeHandoverMethod=").append(noticeHandoverMethod);
+        sb.append(", portId=").append(portId);
+        sb.append(", noticePortConstructionFee=").append(noticePortConstructionFee);
+        sb.append(", noticeDeliveryTime=").append(noticeDeliveryTime);
+        sb.append(", noticePileFreeDays=").append(noticePileFreeDays);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", noticeDistributionStatus=").append(noticeDistributionStatus);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", purchaseContractUnitPrice=").append(purchaseContractUnitPrice);
+        sb.append(", purchaseContractMoisture=").append(purchaseContractMoisture);
+        sb.append(", purchaseContractQualityindex=").append(purchaseContractQualityindex);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,243 @@
+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 OmsshipInstructionsCapacity implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(INSTRUCTIONS_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal instructionsCapacityId;
+
+    /**
+     * 装船指令ID(INSTRUCTIONS_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="装船指令ID",required=false)
+    private BigDecimal instructionsId;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 计划装载吨位(INSTRUCTION_PLANNED_LOADING,DECIMAL,0)
+     */
+    @ApiModelProperty(value="计划装载吨位",required=false)
+    private BigDecimal instructionPlannedLoading;
+
+    /**
+     * 船舶当前位置(INSTRUCTIONS_SHIP_POSITION,VARCHAR,20)
+     */
+    @ApiModelProperty(value="船舶当前位置",required=false)
+    private String instructionsShipPosition;
+
+    /**
+     * 船舶联系方式(INSTRUCTION_CONTACT_INF,VARCHAR,50)
+     */
+    @ApiModelProperty(value="船舶联系方式",required=false)
+    private String instructionContactInf;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 船舶状态(INSTRUCTIONS_CAPACITY_STATUS,VARCHAR,100)
+     */
+    @ApiModelProperty(value="船舶状态",required=false)
+    private String instructionsCapacityStatus;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 预计到港时间(INSTRUCTION_ESARRIVAL_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="预计到港时间",required=false)
+    private Date instructionEsarrivalTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.instructionsCapacityId;
+    }
+
+    @Override
+    public void setId(BigDecimal instructionsCapacityId) {
+        this.instructionsCapacityId = instructionsCapacityId;
+    }
+
+    public BigDecimal getInstructionsCapacityId() {
+        return instructionsCapacityId;
+    }
+
+    public void setInstructionsCapacityId(BigDecimal instructionsCapacityId) {
+        this.instructionsCapacityId = instructionsCapacityId;
+    }
+
+    public BigDecimal getInstructionsId() {
+        return instructionsId;
+    }
+
+    public void setInstructionsId(BigDecimal instructionsId) {
+        this.instructionsId = instructionsId;
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public BigDecimal getInstructionPlannedLoading() {
+        return instructionPlannedLoading;
+    }
+
+    public void setInstructionPlannedLoading(BigDecimal instructionPlannedLoading) {
+        this.instructionPlannedLoading = instructionPlannedLoading;
+    }
+
+    public String getInstructionsShipPosition() {
+        return instructionsShipPosition;
+    }
+
+    public void setInstructionsShipPosition(String instructionsShipPosition) {
+        this.instructionsShipPosition = instructionsShipPosition == null ? null : instructionsShipPosition.trim();
+    }
+
+    public String getInstructionContactInf() {
+        return instructionContactInf;
+    }
+
+    public void setInstructionContactInf(String instructionContactInf) {
+        this.instructionContactInf = instructionContactInf == null ? null : instructionContactInf.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getInstructionsCapacityStatus() {
+        return instructionsCapacityStatus;
+    }
+
+    public void setInstructionsCapacityStatus(String instructionsCapacityStatus) {
+        this.instructionsCapacityStatus = instructionsCapacityStatus == null ? null : instructionsCapacityStatus.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public Date getInstructionEsarrivalTime() {
+        return instructionEsarrivalTime;
+    }
+
+    public void setInstructionEsarrivalTime(Date instructionEsarrivalTime) {
+        this.instructionEsarrivalTime = instructionEsarrivalTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", instructionsCapacityId=").append(instructionsCapacityId);
+        sb.append(", instructionsId=").append(instructionsId);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", instructionPlannedLoading=").append(instructionPlannedLoading);
+        sb.append(", instructionsShipPosition=").append(instructionsShipPosition);
+        sb.append(", instructionContactInf=").append(instructionContactInf);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", instructionsCapacityStatus=").append(instructionsCapacityStatus);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", instructionEsarrivalTime=").append(instructionEsarrivalTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,258 @@
+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 OmsshipShipmentInstructions implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(SHIPMENT_INSTRUCTIONS_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal shipmentInstructionsId;
+
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="批次ID",required=false)
+    private BigDecimal batchId;
+
+    /**
+     * 收件人ID（下游码头）(RECIPIENT_CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="收件人ID（下游码头）",required=false)
+    private BigDecimal recipientCarrierId;
+
+    /**
+     * 发件人ID（港口）(PORT_CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="发件人ID（港口）",required=false)
+    private BigDecimal portCarrierId;
+
+    /**
+     * 合计吨位(INSTRUCTIONS_TOTAL_TONNAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="合计吨位",required=false)
+    private BigDecimal instructionsTotalTonnage;
+
+    /**
+     * 日期(INSTRUCTION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date instructionTime;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 是否删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 下发状态（0：未下发，1：已下发）(INSTRUCTION_ISSUE_STATUS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="下发状态（0：未下发，1：已下发）",required=false)
+    private String instructionIssueStatus;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.shipmentInstructionsId;
+    }
+
+    @Override
+    public void setId(BigDecimal shipmentInstructionsId) {
+        this.shipmentInstructionsId = shipmentInstructionsId;
+    }
+
+    public BigDecimal getShipmentInstructionsId() {
+        return shipmentInstructionsId;
+    }
+
+    public void setShipmentInstructionsId(BigDecimal shipmentInstructionsId) {
+        this.shipmentInstructionsId = shipmentInstructionsId;
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public BigDecimal getRecipientCarrierId() {
+        return recipientCarrierId;
+    }
+
+    public void setRecipientCarrierId(BigDecimal recipientCarrierId) {
+        this.recipientCarrierId = recipientCarrierId;
+    }
+
+    public BigDecimal getPortCarrierId() {
+        return portCarrierId;
+    }
+
+    public void setPortCarrierId(BigDecimal portCarrierId) {
+        this.portCarrierId = portCarrierId;
+    }
+
+    public BigDecimal getInstructionsTotalTonnage() {
+        return instructionsTotalTonnage;
+    }
+
+    public void setInstructionsTotalTonnage(BigDecimal instructionsTotalTonnage) {
+        this.instructionsTotalTonnage = instructionsTotalTonnage;
+    }
+
+    public Date getInstructionTime() {
+        return instructionTime;
+    }
+
+    public void setInstructionTime(Date instructionTime) {
+        this.instructionTime = instructionTime;
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getInstructionIssueStatus() {
+        return instructionIssueStatus;
+    }
+
+    public void setInstructionIssueStatus(String instructionIssueStatus) {
+        this.instructionIssueStatus = instructionIssueStatus == null ? null : instructionIssueStatus.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", shipmentInstructionsId=").append(shipmentInstructionsId);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", recipientCarrierId=").append(recipientCarrierId);
+        sb.append(", portCarrierId=").append(portCarrierId);
+        sb.append(", instructionsTotalTonnage=").append(instructionsTotalTonnage);
+        sb.append(", instructionTime=").append(instructionTime);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", instructionIssueStatus=").append(instructionIssueStatus);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,273 @@
+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 TmsshipBargeOperation implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(BARGE_OPERATION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal bargeOperationId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 小船装载重量(BARGE_SMALLSHIP_LOAD_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="小船装载重量",required=false)
+    private BigDecimal bargeSmallshipLoadWeight;
+
+    /**
+     * 小船ID(SMALL_CAPACITY_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="小船ID",required=false)
+    private BigDecimal smallCapacityId;
+
+    /**
+     * 分驳日期(BARGE_REFUTE_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="分驳日期",required=false)
+    private Date bargeRefuteDate;
+
+    /**
+     * 分驳地点(BARGE_REFUTE_LOCATION,VARCHAR,20)
+     */
+    @ApiModelProperty(value="分驳地点",required=false)
+    private String bargeRefuteLocation;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 回驳日期(BARGE_BACK_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="回驳日期",required=false)
+    private Date bargeBackDate;
+
+    /**
+     * 回驳地点(BARGE_BACK_LOCATION,VARCHAR,20)
+     */
+    @ApiModelProperty(value="回驳地点",required=false)
+    private String bargeBackLocation;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.bargeOperationId;
+    }
+
+    @Override
+    public void setId(BigDecimal bargeOperationId) {
+        this.bargeOperationId = bargeOperationId;
+    }
+
+    public BigDecimal getBargeOperationId() {
+        return bargeOperationId;
+    }
+
+    public void setBargeOperationId(BigDecimal bargeOperationId) {
+        this.bargeOperationId = bargeOperationId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getBargeSmallshipLoadWeight() {
+        return bargeSmallshipLoadWeight;
+    }
+
+    public void setBargeSmallshipLoadWeight(BigDecimal bargeSmallshipLoadWeight) {
+        this.bargeSmallshipLoadWeight = bargeSmallshipLoadWeight;
+    }
+
+    public BigDecimal getSmallCapacityId() {
+        return smallCapacityId;
+    }
+
+    public void setSmallCapacityId(BigDecimal smallCapacityId) {
+        this.smallCapacityId = smallCapacityId;
+    }
+
+    public Date getBargeRefuteDate() {
+        return bargeRefuteDate;
+    }
+
+    public void setBargeRefuteDate(Date bargeRefuteDate) {
+        this.bargeRefuteDate = bargeRefuteDate;
+    }
+
+    public String getBargeRefuteLocation() {
+        return bargeRefuteLocation;
+    }
+
+    public void setBargeRefuteLocation(String bargeRefuteLocation) {
+        this.bargeRefuteLocation = bargeRefuteLocation == null ? null : bargeRefuteLocation.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public Date getBargeBackDate() {
+        return bargeBackDate;
+    }
+
+    public void setBargeBackDate(Date bargeBackDate) {
+        this.bargeBackDate = bargeBackDate;
+    }
+
+    public String getBargeBackLocation() {
+        return bargeBackLocation;
+    }
+
+    public void setBargeBackLocation(String bargeBackLocation) {
+        this.bargeBackLocation = bargeBackLocation == null ? null : bargeBackLocation.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", bargeOperationId=").append(bargeOperationId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", bargeSmallshipLoadWeight=").append(bargeSmallshipLoadWeight);
+        sb.append(", smallCapacityId=").append(smallCapacityId);
+        sb.append(", bargeRefuteDate=").append(bargeRefuteDate);
+        sb.append(", bargeRefuteLocation=").append(bargeRefuteLocation);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", bargeBackDate=").append(bargeBackDate);
+        sb.append(", bargeBackLocation=").append(bargeBackLocation);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,258 @@
+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 TmsshipEntryWharyResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 实绩编号(RESULT_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="实绩编号",required=false)
+    private String resultNumber;
+
+    /**
+     * 码头ID(WHARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="码头ID",required=false)
+    private BigDecimal wharyId;
+
+    /**
+     * 报港时间(RESULT_PORT_DECLARATION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="报港时间",required=false)
+    private Date resultPortDeclarationTime;
+
+    /**
+     * 报港确认人(RESULT_PORT_DECLARATION_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="报港确认人",required=false)
+    private String resultPortDeclarationName;
+
+    /**
+     * 抵达时间(RESULT_ARRIVAL_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="抵达时间",required=false)
+    private Date resultArrivalTime;
+
+    /**
+     * 备注(RESULT_MEMO,VARCHAR,128)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String resultMemo;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.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 getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public String getResultNumber() {
+        return resultNumber;
+    }
+
+    public void setResultNumber(String resultNumber) {
+        this.resultNumber = resultNumber == null ? null : resultNumber.trim();
+    }
+
+    public BigDecimal getWharyId() {
+        return wharyId;
+    }
+
+    public void setWharyId(BigDecimal wharyId) {
+        this.wharyId = wharyId;
+    }
+
+    public Date getResultPortDeclarationTime() {
+        return resultPortDeclarationTime;
+    }
+
+    public void setResultPortDeclarationTime(Date resultPortDeclarationTime) {
+        this.resultPortDeclarationTime = resultPortDeclarationTime;
+    }
+
+    public String getResultPortDeclarationName() {
+        return resultPortDeclarationName;
+    }
+
+    public void setResultPortDeclarationName(String resultPortDeclarationName) {
+        this.resultPortDeclarationName = resultPortDeclarationName == null ? null : resultPortDeclarationName.trim();
+    }
+
+    public Date getResultArrivalTime() {
+        return resultArrivalTime;
+    }
+
+    public void setResultArrivalTime(Date resultArrivalTime) {
+        this.resultArrivalTime = resultArrivalTime;
+    }
+
+    public String getResultMemo() {
+        return resultMemo;
+    }
+
+    public void setResultMemo(String resultMemo) {
+        this.resultMemo = resultMemo == null ? null : resultMemo.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @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(", totalResultId=").append(totalResultId);
+        sb.append(", resultNumber=").append(resultNumber);
+        sb.append(", wharyId=").append(wharyId);
+        sb.append(", resultPortDeclarationTime=").append(resultPortDeclarationTime);
+        sb.append(", resultPortDeclarationName=").append(resultPortDeclarationName);
+        sb.append(", resultArrivalTime=").append(resultArrivalTime);
+        sb.append(", resultMemo=").append(resultMemo);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/model/TmsshipLoadShipResult.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 TmsshipLoadShipResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 起运港(LOCATION_START_PORT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="起运港",required=false)
+    private BigDecimal locationStartPortId;
+
+    /**
+     * 到达港ID(ARRIVAL_PORT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="到达港ID",required=false)
+    private BigDecimal arrivalPortId;
+
+    /**
+     * 批次id(BATCH_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="批次id",required=false)
+    private BigDecimal batchId;
+
+    /**
+     * 放货日期(RESULT_DELIVERY_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="放货日期",required=false)
+    private Date resultDeliveryDate;
+
+    /**
+     * 实装数量（吨）(RESULT_ACTUAL_INSTALLATIONS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="实装数量（吨）",required=false)
+    private BigDecimal resultActualInstallations;
+
+    /**
+     * 实绩编号(RESULT_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="实绩编号",required=false)
+    private String resultNumber;
+
+    /**
+     * 原料港存库实时库存ID(RWAREHOUSE_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="原料港存库实时库存ID",required=false)
+    private BigDecimal rwarehouseMaterialId;
+
+    /**
+     * 抵港时间(RESULT_ARRIVAL_PORT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="抵港时间",required=false)
+    private Date resultArrivalPortTime;
+
+    /**
+     * 离港时间(RESULT_OUT_PORT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="离港时间",required=false)
+    private Date resultOutPortTime;
+
+    /**
+     * 装船日期(RESULT_LOAD_SHIP_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="装船日期",required=false)
+    private Date resultLoadShipDate;
+
+    /**
+     * 是否清场（没清场；清场）(RESULT_ISCLEAR,VARCHAR,20)
+     */
+    @ApiModelProperty(value="是否清场（没清场；清场）",required=false)
+    private String resultIsclear;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0：未删除，1：已删除）(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除（0：未删除，1：已删除）",required=false)
+    private BigDecimal deleted;
+
+    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 getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public BigDecimal getLocationStartPortId() {
+        return locationStartPortId;
+    }
+
+    public void setLocationStartPortId(BigDecimal locationStartPortId) {
+        this.locationStartPortId = locationStartPortId;
+    }
+
+    public BigDecimal getArrivalPortId() {
+        return arrivalPortId;
+    }
+
+    public void setArrivalPortId(BigDecimal arrivalPortId) {
+        this.arrivalPortId = arrivalPortId;
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public Date getResultDeliveryDate() {
+        return resultDeliveryDate;
+    }
+
+    public void setResultDeliveryDate(Date resultDeliveryDate) {
+        this.resultDeliveryDate = resultDeliveryDate;
+    }
+
+    public BigDecimal getResultActualInstallations() {
+        return resultActualInstallations;
+    }
+
+    public void setResultActualInstallations(BigDecimal resultActualInstallations) {
+        this.resultActualInstallations = resultActualInstallations;
+    }
+
+    public String getResultNumber() {
+        return resultNumber;
+    }
+
+    public void setResultNumber(String resultNumber) {
+        this.resultNumber = resultNumber == null ? null : resultNumber.trim();
+    }
+
+    public BigDecimal getRwarehouseMaterialId() {
+        return rwarehouseMaterialId;
+    }
+
+    public void setRwarehouseMaterialId(BigDecimal rwarehouseMaterialId) {
+        this.rwarehouseMaterialId = rwarehouseMaterialId;
+    }
+
+    public Date getResultArrivalPortTime() {
+        return resultArrivalPortTime;
+    }
+
+    public void setResultArrivalPortTime(Date resultArrivalPortTime) {
+        this.resultArrivalPortTime = resultArrivalPortTime;
+    }
+
+    public Date getResultOutPortTime() {
+        return resultOutPortTime;
+    }
+
+    public void setResultOutPortTime(Date resultOutPortTime) {
+        this.resultOutPortTime = resultOutPortTime;
+    }
+
+    public Date getResultLoadShipDate() {
+        return resultLoadShipDate;
+    }
+
+    public void setResultLoadShipDate(Date resultLoadShipDate) {
+        this.resultLoadShipDate = resultLoadShipDate;
+    }
+
+    public String getResultIsclear() {
+        return resultIsclear;
+    }
+
+    public void setResultIsclear(String resultIsclear) {
+        this.resultIsclear = resultIsclear == null ? null : resultIsclear.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @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(", totalResultId=").append(totalResultId);
+        sb.append(", locationStartPortId=").append(locationStartPortId);
+        sb.append(", arrivalPortId=").append(arrivalPortId);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", resultDeliveryDate=").append(resultDeliveryDate);
+        sb.append(", resultActualInstallations=").append(resultActualInstallations);
+        sb.append(", resultNumber=").append(resultNumber);
+        sb.append(", rwarehouseMaterialId=").append(rwarehouseMaterialId);
+        sb.append(", resultArrivalPortTime=").append(resultArrivalPortTime);
+        sb.append(", resultOutPortTime=").append(resultOutPortTime);
+        sb.append(", resultLoadShipDate=").append(resultLoadShipDate);
+        sb.append(", resultIsclear=").append(resultIsclear);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,243 @@
+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 TmsshipOutWharyResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 实绩编号(RESULT_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="实绩编号",required=false)
+    private String resultNumber;
+
+    /**
+     * 码头ID(WHARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="码头ID",required=false)
+    private BigDecimal wharyId;
+
+    /**
+     * 离港时间(RESULT_OUT_WHARY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="离港时间",required=false)
+    private Date resultOutWharyTime;
+
+    /**
+     * 离港确认人(RESULT_OUT_WHARY_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="离港确认人",required=false)
+    private String resultOutWharyName;
+
+    /**
+     * 备注(RESULT_MEMO,VARCHAR,128)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String resultMemo;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.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 getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public String getResultNumber() {
+        return resultNumber;
+    }
+
+    public void setResultNumber(String resultNumber) {
+        this.resultNumber = resultNumber == null ? null : resultNumber.trim();
+    }
+
+    public BigDecimal getWharyId() {
+        return wharyId;
+    }
+
+    public void setWharyId(BigDecimal wharyId) {
+        this.wharyId = wharyId;
+    }
+
+    public Date getResultOutWharyTime() {
+        return resultOutWharyTime;
+    }
+
+    public void setResultOutWharyTime(Date resultOutWharyTime) {
+        this.resultOutWharyTime = resultOutWharyTime;
+    }
+
+    public String getResultOutWharyName() {
+        return resultOutWharyName;
+    }
+
+    public void setResultOutWharyName(String resultOutWharyName) {
+        this.resultOutWharyName = resultOutWharyName == null ? null : resultOutWharyName.trim();
+    }
+
+    public String getResultMemo() {
+        return resultMemo;
+    }
+
+    public void setResultMemo(String resultMemo) {
+        this.resultMemo = resultMemo == null ? null : resultMemo.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @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(", totalResultId=").append(totalResultId);
+        sb.append(", resultNumber=").append(resultNumber);
+        sb.append(", wharyId=").append(wharyId);
+        sb.append(", resultOutWharyTime=").append(resultOutWharyTime);
+        sb.append(", resultOutWharyName=").append(resultOutWharyName);
+        sb.append(", resultMemo=").append(resultMemo);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,243 @@
+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 TmsshipShipLocation implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(LOCATION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal locationId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 途径位置(LOCATION_VALUE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="途径位置",required=false)
+    private String locationValue;
+
+    /**
+     * 途径时间(LOCATION_ROUTE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="途径时间",required=false)
+    private Date locationRouteTime;
+
+    /**
+     * 备注说明(LOCATION_MEMO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="备注说明",required=false)
+    private String locationMemo;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 位置状态:未到闸船舶、等闸船舶、已过闸船舶、到港待卸船舶(LOCATION_STATUS,VARCHAR,36)
+     */
+    @ApiModelProperty(value="位置状态:未到闸船舶、等闸船舶、已过闸船舶、到港待卸船舶",required=false)
+    private String locationStatus;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.locationId;
+    }
+
+    @Override
+    public void setId(BigDecimal locationId) {
+        this.locationId = locationId;
+    }
+
+    public BigDecimal getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(BigDecimal locationId) {
+        this.locationId = locationId;
+    }
+
+    public BigDecimal getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public String getLocationValue() {
+        return locationValue;
+    }
+
+    public void setLocationValue(String locationValue) {
+        this.locationValue = locationValue == null ? null : locationValue.trim();
+    }
+
+    public Date getLocationRouteTime() {
+        return locationRouteTime;
+    }
+
+    public void setLocationRouteTime(Date locationRouteTime) {
+        this.locationRouteTime = locationRouteTime;
+    }
+
+    public String getLocationMemo() {
+        return locationMemo;
+    }
+
+    public void setLocationMemo(String locationMemo) {
+        this.locationMemo = locationMemo == null ? null : locationMemo.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getLocationStatus() {
+        return locationStatus;
+    }
+
+    public void setLocationStatus(String locationStatus) {
+        this.locationStatus = locationStatus == null ? null : locationStatus.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal 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(", locationId=").append(locationId);
+        sb.append(", totalResultId=").append(totalResultId);
+        sb.append(", locationValue=").append(locationValue);
+        sb.append(", locationRouteTime=").append(locationRouteTime);
+        sb.append(", locationMemo=").append(locationMemo);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", locationStatus=").append(locationStatus);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,185 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="船运总实绩")
+public class TmsshipTotalResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 船运订单ID(ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="船运订单ID",required=false)
+    private BigDecimal orderId;
+
+    /**
+     * 运输总时长(RESULT_DURATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输总时长",required=false)
+    private Integer resultDuration;
+
+    /**
+     * 运输标准时长(STANDARD_DATA_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运输标准时长",required=true)
+    private BigDecimal standardDataId;
+
+    /**
+     * 运输时长异常值(RESULT_OUTLIER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输时长异常值",required=false)
+    private Integer resultOutlier;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.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 getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getResultDuration() {
+        return resultDuration;
+    }
+
+    public void setResultDuration(Integer resultDuration) {
+        this.resultDuration = resultDuration;
+    }
+
+    public BigDecimal getStandardDataId() {
+        return standardDataId;
+    }
+
+    public void setStandardDataId(BigDecimal standardDataId) {
+        this.standardDataId = standardDataId;
+    }
+
+    public Integer getResultOutlier() {
+        return resultOutlier;
+    }
+
+    public void setResultOutlier(Integer resultOutlier) {
+        this.resultOutlier = resultOutlier;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", orderId=").append(orderId);
+        sb.append(", resultDuration=").append(resultDuration);
+        sb.append(", standardDataId=").append(standardDataId);
+        sb.append(", resultOutlier=").append(resultOutlier);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,243 @@
+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 TmsshipUnloadShipResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 抵港日期(RESULT_ARRIVAL_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="抵港日期",required=false)
+    private Date resultArrivalDate;
+
+    /**
+     * 卸船开始时间(RESULT_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸船开始时间",required=false)
+    private Date resultStartTime;
+
+    /**
+     * 卸船结束时间(RESULT_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸船结束时间",required=false)
+    private Date resultEndTime;
+
+    /**
+     * 卸船状态（已盖蓬，未盖蓬）(RESULT_STATUS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="卸船状态（已盖蓬，未盖蓬）",required=false)
+    private String resultStatus;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    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 getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public Date getResultArrivalDate() {
+        return resultArrivalDate;
+    }
+
+    public void setResultArrivalDate(Date resultArrivalDate) {
+        this.resultArrivalDate = resultArrivalDate;
+    }
+
+    public Date getResultStartTime() {
+        return resultStartTime;
+    }
+
+    public void setResultStartTime(Date resultStartTime) {
+        this.resultStartTime = resultStartTime;
+    }
+
+    public Date getResultEndTime() {
+        return resultEndTime;
+    }
+
+    public void setResultEndTime(Date resultEndTime) {
+        this.resultEndTime = resultEndTime;
+    }
+
+    public String getResultStatus() {
+        return resultStatus;
+    }
+
+    public void setResultStatus(String resultStatus) {
+        this.resultStatus = resultStatus == null ? null : resultStatus.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    @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(", totalResultId=").append(totalResultId);
+        sb.append(", resultArrivalDate=").append(resultArrivalDate);
+        sb.append(", resultStartTime=").append(resultStartTime);
+        sb.append(", resultEndTime=").append(resultEndTime);
+        sb.append(", resultStatus=").append(resultStatus);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,303 @@
+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 TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal totalResultId;
+
+    /**
+     * 计划日期(RESULT_PLANNED_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计划日期",required=false)
+    private Date resultPlannedDate;
+
+    /**
+     * 货权日期(RESULT_CARGO_RIGHTS_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="货权日期",required=false)
+    private Date resultCargoRightsDate;
+
+    /**
+     * 装船比例（该船实装吨位/整个装船指令下实装总吨位）(RESULT_SHIPMENT_RATIO,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装船比例（该船实装吨位/整个装船指令下实装总吨位）",required=false)
+    private BigDecimal resultShipmentRatio;
+
+    /**
+     * 空舱/重载水尺米(RESULT_EMPTY_HEAVY_WATER_METER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="空舱/重载水尺米",required=false)
+    private BigDecimal resultEmptyHeavyWaterMeter;
+
+    /**
+     * 含水率(RESULT_MOISTURE_CONTENT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="含水率",required=false)
+    private BigDecimal resultMoistureContent;
+
+    /**
+     * 水分吨位(RESULT_WATER_TONNAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="水分吨位",required=false)
+    private BigDecimal resultWaterTonnage;
+
+    /**
+     * 检测费(RESULT_INSPECTION_FEES,DECIMAL,0)
+     */
+    @ApiModelProperty(value="检测费",required=false)
+    private BigDecimal resultInspectionFees;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,16)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,VARCHAR,14)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private String deleteTime;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 预计放货日期(RESULT_ES_DELIVERY_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="预计放货日期",required=false)
+    private Date resultEsDeliveryDate;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal 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 BigDecimal getTotalResultId() {
+        return totalResultId;
+    }
+
+    public void setTotalResultId(BigDecimal totalResultId) {
+        this.totalResultId = totalResultId;
+    }
+
+    public Date getResultPlannedDate() {
+        return resultPlannedDate;
+    }
+
+    public void setResultPlannedDate(Date resultPlannedDate) {
+        this.resultPlannedDate = resultPlannedDate;
+    }
+
+    public Date getResultCargoRightsDate() {
+        return resultCargoRightsDate;
+    }
+
+    public void setResultCargoRightsDate(Date resultCargoRightsDate) {
+        this.resultCargoRightsDate = resultCargoRightsDate;
+    }
+
+    public BigDecimal getResultShipmentRatio() {
+        return resultShipmentRatio;
+    }
+
+    public void setResultShipmentRatio(BigDecimal resultShipmentRatio) {
+        this.resultShipmentRatio = resultShipmentRatio;
+    }
+
+    public BigDecimal getResultEmptyHeavyWaterMeter() {
+        return resultEmptyHeavyWaterMeter;
+    }
+
+    public void setResultEmptyHeavyWaterMeter(BigDecimal resultEmptyHeavyWaterMeter) {
+        this.resultEmptyHeavyWaterMeter = resultEmptyHeavyWaterMeter;
+    }
+
+    public BigDecimal getResultMoistureContent() {
+        return resultMoistureContent;
+    }
+
+    public void setResultMoistureContent(BigDecimal resultMoistureContent) {
+        this.resultMoistureContent = resultMoistureContent;
+    }
+
+    public BigDecimal getResultWaterTonnage() {
+        return resultWaterTonnage;
+    }
+
+    public void setResultWaterTonnage(BigDecimal resultWaterTonnage) {
+        this.resultWaterTonnage = resultWaterTonnage;
+    }
+
+    public BigDecimal getResultInspectionFees() {
+        return resultInspectionFees;
+    }
+
+    public void setResultInspectionFees(BigDecimal resultInspectionFees) {
+        this.resultInspectionFees = resultInspectionFees;
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public String getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(String deleteTime) {
+        this.deleteTime = deleteTime == null ? null : deleteTime.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Date getResultEsDeliveryDate() {
+        return resultEsDeliveryDate;
+    }
+
+    public void setResultEsDeliveryDate(Date resultEsDeliveryDate) {
+        this.resultEsDeliveryDate = resultEsDeliveryDate;
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal 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(", totalResultId=").append(totalResultId);
+        sb.append(", resultPlannedDate=").append(resultPlannedDate);
+        sb.append(", resultCargoRightsDate=").append(resultCargoRightsDate);
+        sb.append(", resultShipmentRatio=").append(resultShipmentRatio);
+        sb.append(", resultEmptyHeavyWaterMeter=").append(resultEmptyHeavyWaterMeter);
+        sb.append(", resultMoistureContent=").append(resultMoistureContent);
+        sb.append(", resultWaterTonnage=").append(resultWaterTonnage);
+        sb.append(", resultInspectionFees=").append(resultInspectionFees);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", resultEsDeliveryDate=").append(resultEsDeliveryDate);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,40 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import io.swagger.models.auth.In;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipCargoTransferResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:36
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipCargoTransferResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmsshipCargoTransferResultService{
+    List<Map<String,Object>> seletCargoTransfer(Map<String,Object> mapVal);
+    //添加货权转移信息
+    int insertSelective(AmsshipCargoTransferResult amsshipCargoTransferResult);
+    //删除货权转移信息
+    int deleteByPrimaryKey(BigDecimal cargoTransferResultId);
+    //修改货权转移信息
+    int updateByPrimaryKey(BigDecimal cargoTransferResultId);
+    BigDecimal selectMaxId();
+    //  根据关键字查找信息
+    AmsshipCargoTransferResult selectByPrimaryKey(BigDecimal cargoTransferResultId);
+    List<Map<String,Object>> getGroup();
+    List<Map<String,Object>> getCargoId();
+    int updateByPrimaryKeySelective(AmsshipCargoTransferResult amsshipCargoTransferResult);
+    List<Map<String,Object>> selectByOrder(Integer cargoTransferResultId);
+    List<Map<String,Object>>  insertBetchId( );
+}

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

@@ -0,0 +1,62 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipDeliveryAttorney服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:44
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryAttorney服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmsshipDeliveryAttorneyService{
+    List<Map<String,Object>> selectshipCargoTranferResult(Map<String,Object> mapVal);
+    //新增提货委托
+    int insert(AmsshipDeliveryAttorney amsshipDeliveryAttorney);
+    //删除提货委托信息
+    int deleteByPrimaryKey(BigDecimal attorneyId);
+    //修改提货委托信息
+    int updateByPrimaryKey(BigDecimal attorneyId);
+    BigDecimal selectMaxId();
+    AmsshipDeliveryAttorney selectByPrimaryKey(BigDecimal attorneyId);
+    List<Map<String,Object>> getPortName();
+    List<Map<String,Object>> getNoticeId();
+    int updateByPrimaryKeySelective(AmsshipDeliveryAttorney amsshipDeliveryAttorney);
+    List<Map<String,Object>> getDeliveryAttorneyId(Integer attorneyId);
+    /**
+     * 查询AttorneyId
+     * @return
+     */
+    List<Map<String, Object>> getAttorneyId();
+
+    /**
+     * 查询PortId
+     * @return
+     */
+    List<Map<String, Object>> getPortId();
+
+    /**
+     * 查询PierId
+     * @return
+     */
+    List<Map<String, Object>> getPierId();
+
+    /**
+     * 仓库id
+     * @return
+     */
+    List<Map<String, Object>> getRmRawId();
+}

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

@@ -0,0 +1,42 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipDeliveryNotice服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:54
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryNotice服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmsshipDeliveryNoticeService{
+
+    // 展示收货通知单信息
+    List<Map<String,Object>> selectShipDeliveryNotice(Map<String,Object> mapVal);
+    //添加收货通知单信息
+    int insert(AmsshipDeliveryNotice amsshipDeliveryNotice);
+    //删除收货通知单信息
+    int deleteByPrimaryKey(BigDecimal noticeId);
+    //修改收货通知单信息
+    int updateByPrimaryKey(BigDecimal noticeId);
+    //得到id
+    BigDecimal selectMaxId();
+    AmsshipDeliveryNotice selectByPrimaryKey(BigDecimal noticeId);
+    List<Map<String,Object>> getResultNumber();
+    List<Map<String,Object>>  getcarrier();
+    //    List<Map<String,Object>>  getOrderNo();
+    List<Map<String,Object>>  getShipper();
+    int updateByPrimaryKeySelective(AmsshipDeliveryNotice amsshipDeliveryNotice);
+    List<Map<String,Object>> selectByNoticeId(Integer noticeId);
+}

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

@@ -0,0 +1,86 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
+import com.steerinfo.framework.service.IBaseService;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OmsshipInstructionsCapacity服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipInstructionsCapacity服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IOmsshipInstructionsCapacityService{
+
+    /**
+     * 查询orderId
+     * @return
+     */
+    List<Map<String, Object>> getOrderId();
+
+    /**
+     * 查询最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+
+    /**
+     * 插入
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    int insert(OmsshipInstructionsCapacity omsshipInstructionsCapacity);
+
+    /**
+     * 根据主键删除
+     * @param instructionsCapacityId
+     * @return
+     */
+    int deleteByPrimaryKey(BigDecimal instructionsCapacityId);
+
+
+    /**
+     * 根据主键查看详细
+     * @param instructionsCapacityId
+     * @return
+     */
+    OmsshipInstructionsCapacity selectByPrimaryKey(BigDecimal instructionsCapacityId);
+
+
+    /**
+     * 根据主键修改
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    int updateByPrimaryKeySelective(OmsshipInstructionsCapacity omsshipInstructionsCapacity);
+
+
+    /**
+     * 查询所有船只
+     * @return
+     */
+    List<Map<String,Object>> selectCapacities(Map<String,Object> mapVal);
+
+    /**
+     * 得到运力id
+     * @return
+     */
+    List<Map<String,Object>> getCapacityId();
+
+    /**
+     * 查询表单信息
+     * @param instructionsCapacityId
+     * @return
+     */
+    List<Map<String,Object>> selectInstructionsCapacity(BigDecimal instructionsCapacityId);
+}

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

@@ -0,0 +1,50 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OmsshipShipmentInstructions服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipShipmentInstructions服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IOmsshipShipmentInstructionsService{
+    OmsshipShipmentInstructions selectByKey(BigDecimal shipmentInstructionsId);
+    /**
+     * 查询所有作业位置
+     * @return
+     */
+    List<Map<String,Object>> selectAll(Map<String,Object> mapVal);
+//    int selectKey(BigDecimal shipmentInstructionsId);
+    int deleteByPrimaryKey(BigDecimal shipmentInstructionsId);
+    int insert(OmsshipShipmentInstructions omsshipShipmentInstructions);
+    int updateByPrimaryKey(OmsshipShipmentInstructions omsshipShipmentInstructions);
+    //   得到最大id
+    BigDecimal selectMaxId();
+    List<Map<String,Object>> selectShipmentInstructions(BigDecimal shipmentInstructionsId);
+
+    /**
+     * 修改下发状态
+     * @param shipmentInstructionsId
+     * @return
+     */
+    int updateIssueStatus(BigDecimal shipmentInstructionsId);
+
+    /**
+     * 获得批次下拉框
+     * @return
+     */
+    List<Map<String,Object>> getBatchId();
+}

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

@@ -0,0 +1,67 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipBargeOperation;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipBargeOperation服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 04:04
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipBargeOperation服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipBargeOperationService {
+
+    /**
+     * 新增驳船作业
+     * @param map
+     * @return
+     */
+    int insertBargeOperation(Map<String,Object> map);
+
+    /**
+     * 查询驳船作业
+     * @param bargeOperationId
+     * @return
+     */
+    TmsshipBargeOperation selectBargeOperation(BigDecimal bargeOperationId);
+
+    /**
+     * 删除驳船作业
+     * @param bargeOperationId
+     * @return
+     */
+    int deleteBargeOperation(BigDecimal bargeOperationId);
+
+    /**
+     * 修改驳船作业
+     * @param tmsshipBargeOperation
+     * @return
+     */
+    int updateBargeOperation(TmsshipBargeOperation tmsshipBargeOperation);
+
+    /**
+     * 查询驳船信息列表
+     * @param mapVal
+     * @return
+     */
+    List<Map<String,Object>> selectBargeOperationList(Map<String,Object> mapVal);
+
+    /**
+     * 查询表单信息
+     * @param bargeOperationId
+     * @return
+     */
+    List<Map<String,Object>> getBargeOperation(BigDecimal bargeOperationId);
+
+}

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

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmsshipEntryWharyResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 04:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipEntryWharyResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipEntryWharyResultService {
+
+    /**
+     * 新增抵达实绩
+     * @param mapVal
+     * @return
+     */
+    int insertEntryWharyResult(Map<String,Object> mapVal);
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+}

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

@@ -0,0 +1,82 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipLoadShipResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:47
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipLoadShipResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipLoadShipResultService {
+
+    /**
+     * 插入装船
+     * @param map
+     * @return
+     */
+    int insertLoadShip(Map<String,Object> map);
+
+    /**
+     * 根据主键删除
+     * @param resultId
+     * @return
+     */
+    int deleteLoadShip(BigDecimal resultId);
+
+
+    /**
+     * 根据主键查看详细
+     * @param resultId
+     * @return
+     */
+    TmsshipLoadShipResult selectLoadShip(BigDecimal resultId);
+
+
+    /**
+     * 根据主键修改
+     * @param tmsshipLoadShipResult
+     * @return
+     */
+    int updateLoadShip(TmsshipLoadShipResult tmsshipLoadShipResult);
+
+
+    /**
+     * 查询所有作业位置
+     * @return
+     */
+    List<Map<String,Object>> selectLoadShipList(Map<String,Object> mapVal);
+
+    /**
+     * 查询总重量
+     * @param instructionsId
+     * @return
+     */
+    BigDecimal selectAllWeight(BigDecimal instructionsId);
+
+    /**
+     * 查询装船表单
+     * @return
+     */
+    List<Map<String,Object>> getLoadShip(BigDecimal resultId);
+
+    /**
+     * 根据外轮船名和物资名称得到批次id
+     * @param mapVal
+     * @return
+     */
+    BigDecimal getBatchId(Map<String,Object> mapVal);
+
+}

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

@@ -0,0 +1,39 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipOutWharyResult;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmsshipOutWharyResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:50
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipOutWharyResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipOutWharyResultService {
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+
+    /**
+     * 新增抵达实绩
+     * @param mapVal
+     * @return
+     */
+    int insertOutWharyResult(Map<String,Object> mapVal);
+
+
+
+}

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

@@ -0,0 +1,69 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipShipLocation;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipShipLocation服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:52
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipShipLocation服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipShipLocationService{
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    BigDecimal selectMaxId();
+
+
+    /**
+     * 根据主键删除
+     * @param locationId
+     * @return
+     */
+    int deleteShipLocation(BigDecimal locationId);
+
+    /**
+     * 新增位置
+     * @param map
+     * @return
+     */
+    int addShipLocation(Map<String,Object> map);
+
+    /**
+     * 根据主键查看详细
+     * @param locationId
+     * @return
+     */
+    TmsshipShipLocation selectShipLocation(BigDecimal locationId);
+
+
+    int updateShipLocation(TmsshipShipLocation tmsshipShipLocation);
+
+
+    /**
+     * 查询所有作业位置
+     * @return
+     */
+    List<Map<String,Object>> selectShipLocationList(Map<String,Object> mapVal);
+
+    /**
+     * 查询位置作业表单数据
+     * @param locationId
+     * @return
+     */
+    List<Map<String,Object>> getShipLocation(BigDecimal locationId);
+}

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

@@ -0,0 +1,52 @@
+package com.steerinfo.dil.service;
+
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipTotalResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:55
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipTotalResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipTotalResultService{
+
+
+    /**
+     * 得到总实绩id
+     * @param orderId
+     * @return
+     */
+    BigDecimal selectTotalId(BigDecimal orderId);
+
+    /**
+     * 逻辑获取总实绩id
+     * @param orderId
+     * @return
+     */
+    BigDecimal getResultTotalId(BigDecimal orderId);
+
+
+    /**
+     * 得到 水路订单列表
+     * @return
+     */
+    List<Map<String,Object>> getOrderList(Map<String,Object> mapVal);
+
+    /**
+     * 展示船只信息
+     * @param mapVal
+     * @return
+     */
+    List<Map<String, Object>> getCapacity(Map<String, Object> mapVal);
+
+}

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

@@ -0,0 +1,54 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipUnloadShipResult;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipUnloadShipResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:57
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipUnloadShipResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipUnloadShipResultService {
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insertUnloadShip(Map<String,Object> map);
+
+    // 根据主键删除
+    int deleteUnloadShip(BigDecimal resultId);
+
+
+    //根据主键查看详细
+    TmsshipUnloadShipResult selectUnloadShip(BigDecimal resultId);
+
+
+    // 根据主键修改
+    int updateUnloadShip(TmsshipUnloadShipResult tmsshipUnloadShipResult);
+
+
+    /**
+     * 查询所有水分检测信息
+     * @return
+     */
+    List<Map<String,Object>> selectUnloadShipList(Map<String,Object> mapVal);
+
+    /**
+     * 查询卸船表单信息
+     * @return
+     */
+    List<Map<String,Object>> getUnloadShip(BigDecimal resultId);
+
+}

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

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmsshipWaterQualityResult;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipWaterQualityResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 09:01
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipWaterQualityResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmsshipWaterQualityResultService {
+    // 查询最大id
+    BigDecimal selectMaxId();
+
+    // 插入
+    int insertWaterQualityResult(Map<String,Object> map);
+
+    // 根据主键删除
+    int deleteWaterQualityResult(BigDecimal resultId);
+
+
+    //根据主键查看详细
+    TmsshipWaterQualityResult selectWaterQualityResult(BigDecimal resultId);
+
+
+    // 根据主键修改
+    int updateWaterQualityResult(TmsshipWaterQualityResult tmsshipWaterQualityResult);
+
+
+    /**
+     * 查询所有水分检测信息
+     * @return
+     */
+    List<Map<String,Object>> selectWaterQualityList(Map<String,Object> mapVal);
+
+    /**
+     * 查询所有水分检测表单
+     * @return
+     */
+    List<Map<String,Object>> getWaterQuality(BigDecimal resultId);
+
+    /**
+     * 通过总实绩id获得实际装载重量
+     * @param totalResultId
+     * @return
+     */
+    BigDecimal selectRealWeight(BigDecimal totalResultId);
+
+    /**
+     * 根据子表id查询指令id
+     * @param orderId
+     */
+    BigDecimal selectInstructionsId(BigDecimal orderId);
+}

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

@@ -0,0 +1,122 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.feign.WmshboundFeign;
+import com.steerinfo.dil.model.AmsshipCargoTransferResult;
+import com.steerinfo.dil.mapper.AmsshipCargoTransferResultMapper;
+import com.steerinfo.dil.service.IAmsshipCargoTransferResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipCargoTransferResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:36
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipCargoTransferResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amsshipCargoTransferResultService")
+public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTransferResultService {
+
+    @Autowired
+    private AmsshipCargoTransferResultMapper amsshipCargoTransferResultMapper;
+    @Autowired
+    WmshboundFeign wmshboundFeign;
+
+    @Override
+    public List<Map<String, Object>> seletCargoTransfer(Map<String, Object> mapVal) {
+        return amsshipCargoTransferResultMapper.seletCargoTransfer(mapVal);
+    }
+
+    @Override
+    @Transactional
+    public int insertSelective(AmsshipCargoTransferResult amsshipCargoTransferResult) {
+        //货权转移编号
+        BigDecimal cargoTransferResultId = amsshipCargoTransferResultMapper.selectMaxId();
+        amsshipCargoTransferResult.setCargoTransferResultId(cargoTransferResultId);
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+        String  date=sdf.format(new Date());
+        // 修改港存库实时库存
+        BigDecimal pierId = amsshipCargoTransferResult.getGroupId();
+        BigDecimal portId = amsshipCargoTransferResultMapper.selectPortId(pierId);
+        BigDecimal batchId = amsshipCargoTransferResult.getBatchId();
+        BigDecimal resultNumberOfLoans = amsshipCargoTransferResult.getResultNumberOfLoans();
+        Map<String,Object> map = new HashMap<>();
+        map.put("portId",portId);
+        map.put("batchId",batchId);
+        map.put("resultMaterialNumber",resultNumberOfLoans);
+        wmshboundFeign.addWarehousingResult(map);
+        String resultNumber="ZY"+date+"00"+cargoTransferResultId;
+        amsshipCargoTransferResult.setResultNumber(resultNumber);
+        //  设置常规字段
+        amsshipCargoTransferResult.setInsertTime(new Date());
+        amsshipCargoTransferResult.setDeleteName(null);
+        amsshipCargoTransferResult.setDeleteTime(null);
+        amsshipCargoTransferResult.setInsertUsername("admin");
+        amsshipCargoTransferResult.setUpdateTime(new Date());
+        amsshipCargoTransferResult.setInsertUpdateRemark("无");
+        amsshipCargoTransferResult.setUpdateUsername("admin");
+        amsshipCargoTransferResult.setDeleted(new BigDecimal(0));
+        return amsshipCargoTransferResultMapper.insert(amsshipCargoTransferResult);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(BigDecimal cargoTransferResultId) {
+        return amsshipCargoTransferResultMapper.deleteByPrimaryKey(cargoTransferResultId);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BigDecimal cargoTransferResultId) {
+        return amsshipCargoTransferResultMapper.updateByPrimaryKey(cargoTransferResultId);
+    }
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return amsshipCargoTransferResultMapper.selectMaxId();
+    }
+
+    @Override
+    public AmsshipCargoTransferResult selectByPrimaryKey(BigDecimal cargoTransferResultId) {
+        return amsshipCargoTransferResultMapper.selectByPrimaryKey(cargoTransferResultId);
+    }
+
+    @Override
+    public List<Map<String, Object>> getGroup() {
+        return amsshipCargoTransferResultMapper.getGroup();
+    }
+
+    @Override
+    public List<Map<String, Object>> getCargoId() {
+        return amsshipCargoTransferResultMapper.getCargoId();
+    }
+    //删除
+    @Override
+    public int updateByPrimaryKeySelective(AmsshipCargoTransferResult amsshipCargoTransferResult) {
+        return amsshipCargoTransferResultMapper.updateByPrimaryKeySelective(amsshipCargoTransferResult);
+    }
+
+    @Override
+    public List<Map<String,Object>> selectByOrder(Integer cargoTransferResultId) {
+        return amsshipCargoTransferResultMapper.selectByOrder(cargoTransferResultId);
+    }
+
+    @Override
+    public List<Map<String, Object>> insertBetchId() {
+        return amsshipCargoTransferResultMapper.insertBetchId();
+    }
+
+
+}

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

@@ -0,0 +1,137 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.AmsshipDeliveryAttorneyMapper;
+import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.service.IAmsshipDeliveryAttorneyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipDeliveryAttorney服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:44
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryAttorney服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amsshipDeliveryAttorneyService")
+public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttorneyService {
+
+    @Autowired
+    private AmsshipDeliveryAttorneyMapper amsshipDeliveryAttorneyMapper;
+
+
+    @Override
+    public List<Map<String, Object>> selectshipCargoTranferResult(Map<String, Object> mapVal) {
+        return amsshipDeliveryAttorneyMapper.selectshipCargoTranferResult(mapVal);
+    }
+
+    @Override
+    public int insert(AmsshipDeliveryAttorney amsshipDeliveryAttorney) {
+        BigDecimal attorneyId = amsshipDeliveryAttorneyMapper.selectMaxId();
+        amsshipDeliveryAttorney.setAttorneyId(attorneyId);
+
+        //  设置常规字段
+        amsshipDeliveryAttorney.setAttorneyDistributionStatus("未下发");
+        amsshipDeliveryAttorney.setInsertTime(new Date());
+        amsshipDeliveryAttorney.setDeleteName(null);
+        amsshipDeliveryAttorney.setDeleteTime(null);
+        amsshipDeliveryAttorney.setInsertUsername("admin");
+        amsshipDeliveryAttorney.setUpdateTime(new Date());
+        amsshipDeliveryAttorney.setInsertUpdateRemark("无");
+        amsshipDeliveryAttorney.setUpdateUsername("admin");
+        amsshipDeliveryAttorney.setDeleted((short) 0);
+        return amsshipDeliveryAttorneyMapper.insert(amsshipDeliveryAttorney);
+
+    }
+
+    @Override
+    public int deleteByPrimaryKey(BigDecimal attorneyId) {
+
+
+        return  amsshipDeliveryAttorneyMapper.deleteByPrimaryKey(attorneyId);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BigDecimal attorneyId) {
+        return amsshipDeliveryAttorneyMapper.updateByPrimaryKey(attorneyId);
+    }
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return amsshipDeliveryAttorneyMapper.selectMaxId();
+    }
+
+    @Override
+    public AmsshipDeliveryAttorney selectByPrimaryKey(BigDecimal attorneyId) {
+        return amsshipDeliveryAttorneyMapper.selectByPrimaryKey(attorneyId);
+    }
+
+    @Override
+    public List<Map<String, Object>> getPortName() {
+        return amsshipDeliveryAttorneyMapper.getPortName();
+    }
+
+    @Override
+    public List<Map<String, Object>> getNoticeId() {
+        return amsshipDeliveryAttorneyMapper.getNoticeId();
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(AmsshipDeliveryAttorney amsshipDeliveryAttorney) {
+        return amsshipDeliveryAttorneyMapper.updateByPrimaryKeySelective(amsshipDeliveryAttorney);
+    }
+
+    @Override
+    public List<Map<String, Object>> getDeliveryAttorneyId(Integer attorneyId) {
+        return amsshipDeliveryAttorneyMapper.getDeliveryAttorneyId(attorneyId);
+    }
+
+    /**
+     * 得到提货通知单id
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAttorneyId() {
+        return amsshipDeliveryAttorneyMapper.getAttorneyId();
+    }
+
+    /**
+     * 得到发件人（港口）id
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPortId() {
+        return amsshipDeliveryAttorneyMapper.getPortId();
+    }
+
+    /**
+     * 得到收件人（下游港口）id
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPierId() {
+        return amsshipDeliveryAttorneyMapper.getPierId();
+    }
+
+    @Override
+    public List<Map<String, Object>> getRmRawId() {
+        return amsshipDeliveryAttorneyMapper.getRmRawId();
+    }
+
+
+}

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

@@ -0,0 +1,113 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.AmsshipDeliveryNotice;
+import com.steerinfo.dil.mapper.AmsshipDeliveryNoticeMapper;
+import com.steerinfo.dil.service.IAmsshipDeliveryNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AmsshipDeliveryNotice服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 03:54
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：AmsshipDeliveryNotice服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amsshipDeliveryNoticeService")
+public class AmsshipDeliveryNoticeServiceImpl implements IAmsshipDeliveryNoticeService {
+
+    @Autowired
+    private AmsshipDeliveryNoticeMapper amsshipDeliveryNoticeMapper;
+
+    //查询所有数据
+    @Override
+    public List<Map<String, Object>> selectShipDeliveryNotice(Map<String, Object> mapVal) {
+        return amsshipDeliveryNoticeMapper.selectShipDeliveryNotice(mapVal);
+    }
+    //插入
+    @Override
+    public int insert(AmsshipDeliveryNotice amsshipDeliveryNotice) {
+
+        BigDecimal noticeId = amsshipDeliveryNoticeMapper.selectMaxId();
+        amsshipDeliveryNotice.setNoticeId(noticeId);
+        //  设置常规字段
+        amsshipDeliveryNotice.setNoticeDistributionStatus("未下发");
+        amsshipDeliveryNotice.setInsertTime(new Date());
+        amsshipDeliveryNotice.setDeleteName(null);
+        amsshipDeliveryNotice.setDeleteTime(null);
+        amsshipDeliveryNotice.setInsertUsername("admin");
+        amsshipDeliveryNotice.setUpdateTime(new Date());
+        amsshipDeliveryNotice.setInsertUpdateRemark("无");
+        amsshipDeliveryNotice.setUpdateUsername("admin");
+        amsshipDeliveryNotice.setDeleted((short) 0);
+        return amsshipDeliveryNoticeMapper.insert(amsshipDeliveryNotice);
+    }
+
+    @Override
+    public int deleteByPrimaryKey(BigDecimal noticeId) {
+        return amsshipDeliveryNoticeMapper.deleteByPrimaryKey(noticeId);
+    }
+
+    @Override
+    public int updateByPrimaryKey(BigDecimal noticeId) {
+        return amsshipDeliveryNoticeMapper.updateByPrimaryKey(noticeId);
+    }
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return amsshipDeliveryNoticeMapper.selectMaxId();
+    }
+
+    @Override
+    public AmsshipDeliveryNotice selectByPrimaryKey(BigDecimal noticeId) {
+        return amsshipDeliveryNoticeMapper.selectByPrimaryKey(noticeId);
+    }
+
+    @Override
+    public List<Map<String, Object>> getResultNumber() {
+        return amsshipDeliveryNoticeMapper.getResultNumber();
+    }
+    //货权转移下拉框
+    @Override
+    public List<Map<String, Object>> getcarrier() {
+        return amsshipDeliveryNoticeMapper.getcarrier();
+    }
+////采购订单号下拉框
+//    @Override
+//    public List<Map<String, Object>> getOrderNo() {
+//        return amsshipDeliveryNoticeMapper.getOrderNo();
+//    }
+
+    @Override
+    public List<Map<String, Object>> getShipper() {
+        return amsshipDeliveryNoticeMapper.getShipper();
+    }
+
+    @Override
+    public int updateByPrimaryKeySelective(AmsshipDeliveryNotice amsshipDeliveryNotice) {
+        return amsshipDeliveryNoticeMapper.updateByPrimaryKeySelective(amsshipDeliveryNotice);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectByNoticeId(Integer noticeId) {
+        return amsshipDeliveryNoticeMapper.selectByNoticeId(noticeId);
+    }
+
+
+}

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

@@ -0,0 +1,122 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.OmsshipInstructionsCapacityMapper;
+import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
+import com.steerinfo.dil.service.IOmsshipInstructionsCapacityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OmsshipInstructionsCapacity服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipInstructionsCapacity服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "omsshipInstructionsCapacityService")
+public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructionsCapacityService {
+
+    @Autowired
+    OmsshipInstructionsCapacityMapper omsshipInstructionsCapacityMapper;
+
+
+    @Override
+    public List<Map<String, Object>> getOrderId() {
+        return omsshipInstructionsCapacityMapper.selectOrderId();
+    }
+
+    /**
+     * 获得最大id
+     * @return
+     */
+    @Override
+    public BigDecimal selectMaxId() {
+        return omsshipInstructionsCapacityMapper.selectMaxId();
+    }
+
+    /**
+     * 新增
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @Override
+    public int insert(OmsshipInstructionsCapacity omsshipInstructionsCapacity) {
+        omsshipInstructionsCapacity.setInstructionsCapacityId(selectMaxId());
+        // 设置常规字段
+        omsshipInstructionsCapacity.setDeleted(new BigDecimal(0));
+        omsshipInstructionsCapacity.setInsertTime(new Date());
+        omsshipInstructionsCapacity.setInsertUsername("admin");
+        omsshipInstructionsCapacity.setInsertUpdateRemark("无");
+        omsshipInstructionsCapacity.setUpdateTime(new Date());
+        omsshipInstructionsCapacity.setUpdateUsername("admin");
+        return omsshipInstructionsCapacityMapper.insert(omsshipInstructionsCapacity);
+    }
+
+    /**
+     * 逻辑删除
+     * @param instructionsCapacityId
+     * @return
+     */
+    @Override
+    public int deleteByPrimaryKey(BigDecimal instructionsCapacityId) {
+        OmsshipInstructionsCapacity omsshipInstructionsCapacity = selectByPrimaryKey(instructionsCapacityId);
+        omsshipInstructionsCapacity.setDeleted(new BigDecimal(1));
+        return omsshipInstructionsCapacityMapper.updateByPrimaryKeySelective(omsshipInstructionsCapacity);
+    }
+
+    /**
+     * 查询
+     * @param instructionsCapacityId
+     * @return
+     */
+    @Override
+    public OmsshipInstructionsCapacity selectByPrimaryKey(BigDecimal instructionsCapacityId) {
+        return omsshipInstructionsCapacityMapper.selectByPrimaryKey(instructionsCapacityId);
+    }
+
+    /**
+     * 修改
+     * @param omsshipInstructionsCapacity
+     * @return
+     */
+    @Override
+    public int updateByPrimaryKeySelective(OmsshipInstructionsCapacity omsshipInstructionsCapacity) {
+        omsshipInstructionsCapacity.setUpdateTime(new Date());
+        return omsshipInstructionsCapacityMapper.updateByPrimaryKeySelective(omsshipInstructionsCapacity);
+    }
+
+    /**
+     * 查询一条装船指令下的所有船信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectCapacities(Map<String, Object> mapVal) {
+        return omsshipInstructionsCapacityMapper.selectCapacities(mapVal);
+    }
+
+    @Override
+    public List<Map<String, Object>> getCapacityId() {
+        return omsshipInstructionsCapacityMapper.selectCapacityId();
+    }
+
+    /**
+     * 查询表单信息
+     * @param instructionsCapacityId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectInstructionsCapacity(BigDecimal instructionsCapacityId) {
+        return omsshipInstructionsCapacityMapper.selectInstructionsCapacity(instructionsCapacityId);
+    }
+}

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

@@ -0,0 +1,144 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.OmsshipShipmentInstructions;
+import com.steerinfo.dil.mapper.OmsshipShipmentInstructionsMapper;
+import com.steerinfo.dil.service.IOmsshipShipmentInstructionsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * OmsshipShipmentInstructions服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-20 03:05
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-20
+ * 作者：generator
+ * 参考：
+ * 描述：OmsshipShipmentInstructions服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "omsshipShipmentInstructionsService")
+public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentInstructionsService {
+
+    @Autowired
+    private OmsshipShipmentInstructionsMapper omsshipShipmentInstructionsMapper;
+
+    /**
+     * 通过主键查询
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @Override
+    public OmsshipShipmentInstructions selectByKey(BigDecimal shipmentInstructionsId) {
+        return omsshipShipmentInstructionsMapper.selectByPrimaryKey(shipmentInstructionsId);
+    }
+
+    /**
+     * 展示所有装船指令
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectAll(Map<String, Object> mapVal) {
+        return omsshipShipmentInstructionsMapper.selectAll(mapVal);
+    }
+
+//    @Override
+//    public int selectKey(BigDecimal shipmentInstructionsId) {
+//        return omsshipShipmentInstructionsMapper.selectKey(shipmentInstructionsId);
+//    }
+
+    /**
+     * 逻辑删除
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @Override
+    public int deleteByPrimaryKey(BigDecimal shipmentInstructionsId) {
+        OmsshipShipmentInstructions omsshipShipmentInstructions = selectByKey(shipmentInstructionsId);
+        omsshipShipmentInstructions.setDeleted(new BigDecimal(1));
+        return omsshipShipmentInstructionsMapper.updateByPrimaryKeySelective(omsshipShipmentInstructions);
+    }
+
+    /**
+     * 新增装船指令
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @Override
+    public int insert(OmsshipShipmentInstructions omsshipShipmentInstructions) {
+        BigDecimal shipmentInstructionsId = omsshipShipmentInstructionsMapper.selectMaxId();
+        omsshipShipmentInstructions.setShipmentInstructionsId(shipmentInstructionsId);
+        //  设置常规字段
+        omsshipShipmentInstructions.setInsertTime(new Date());
+        omsshipShipmentInstructions.setDeleteName(null);
+        omsshipShipmentInstructions.setDeleteTime(null);
+        omsshipShipmentInstructions.setInsertUsername("admin");
+        omsshipShipmentInstructions.setUpdateTime(new Date());
+        omsshipShipmentInstructions.setInsertUpdateRemark("无");
+        omsshipShipmentInstructions.setUpdateUsername("admin");
+        omsshipShipmentInstructions.setDeleted(new BigDecimal(0));
+        omsshipShipmentInstructions.setInstructionIssueStatus("未下发");
+        return omsshipShipmentInstructionsMapper.insert(omsshipShipmentInstructions);
+    }
+
+    /**
+     * 通过主键修改
+     * @param omsshipShipmentInstructions
+     * @return
+     */
+    @Override
+    public int updateByPrimaryKey(OmsshipShipmentInstructions omsshipShipmentInstructions) {
+        omsshipShipmentInstructions.setUpdateTime(new Date());
+        return omsshipShipmentInstructionsMapper.updateByPrimaryKeySelective(omsshipShipmentInstructions);
+
+    }
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return omsshipShipmentInstructionsMapper.selectMaxId();
+    }
+
+    /**
+     * 查询装船指令表单
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectShipmentInstructions(BigDecimal shipmentInstructionsId) {
+        return omsshipShipmentInstructionsMapper.selectShipmentInstructions(shipmentInstructionsId);
+    }
+
+    /**
+     * 修改下发状态
+     * @param shipmentInstructionsId
+     * @return
+     */
+    @Override
+    public int updateIssueStatus(BigDecimal shipmentInstructionsId) {
+        OmsshipShipmentInstructions omsshipShipmentInstructions = selectByKey(shipmentInstructionsId);
+        omsshipShipmentInstructions.setInstructionIssueStatus("已下发");
+        return omsshipShipmentInstructionsMapper.updateByPrimaryKeySelective(omsshipShipmentInstructions);
+    }
+
+    /**
+     * 获得批次下拉框
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getBatchId() {
+        return omsshipShipmentInstructionsMapper.getBatchId();
+    }
+}

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

@@ -0,0 +1,129 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipBargeOperation;
+import com.steerinfo.dil.mapper.TmsshipBargeOperationMapper;
+import com.steerinfo.dil.service.ITmsshipBargeOperationService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipBargeOperation服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 04:04
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipBargeOperation服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipBargeOperationService")
+public class TmsshipBargeOperationServiceImpl implements ITmsshipBargeOperationService {
+
+    @Autowired
+    private TmsshipBargeOperationMapper tmsshipBargeOperationMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+    /**
+     * 插入新的驳船作业
+     * @param map
+     * @return
+     */
+    @Override
+    public int insertBargeOperation(Map<String,Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> bagerShipMap = (Map<String, Object>) map.get("bagerShipMap");
+        TmsshipBargeOperation tmsshipBargeOperation = new TmsshipBargeOperation();
+        BigDecimal bargeOperationId = tmsshipBargeOperationMapper.selectMaxId();
+        BigDecimal orderId = new BigDecimal((Integer) bagerShipMap.get("orderId"));
+        BigDecimal resultTotalId = tmsshipTotalResultService.getResultTotalId(orderId);
+        BigDecimal smallCapacityId = new BigDecimal((Integer) mapVal.get("smallCapacityId"));
+        BigDecimal bargeSmallShipLoadWeight = new BigDecimal((String) mapVal.get("bargeSmallshipLoadWeight"));
+        Date bargeRefuteDate = new Date((Long) mapVal.get("bargeRefuteDate"));
+        String bargeRefuteLocation = (String) mapVal.get("bargeRefuteLocation");
+        Date bargeBackDate = new Date((Long) mapVal.get("bargeBackDate"));
+        String bargeBackLocation = (String) mapVal.get("bargeBackLocation");
+        tmsshipBargeOperation.setBargeOperationId(bargeOperationId);
+        tmsshipBargeOperation.setResultTotalId(resultTotalId);
+        tmsshipBargeOperation.setBargeSmallshipLoadWeight(bargeSmallShipLoadWeight);
+        tmsshipBargeOperation.setSmallCapacityId(smallCapacityId);
+        tmsshipBargeOperation.setBargeRefuteDate(bargeRefuteDate);
+        tmsshipBargeOperation.setBargeRefuteLocation(bargeRefuteLocation);
+        tmsshipBargeOperation.setBargeBackLocation(bargeBackLocation);
+        tmsshipBargeOperation.setBargeBackDate(bargeBackDate);
+        // 设置常规字段
+        tmsshipBargeOperation.setDeleted(new BigDecimal(0));
+        tmsshipBargeOperation.setInsertTime(new Date());
+        tmsshipBargeOperation.setUpdateTime(new Date());
+        tmsshipBargeOperation.setInsertUsername("admin");
+        tmsshipBargeOperation.setUpdateUsername("admin");
+        tmsshipBargeOperation.setInsertUpdateRemark("无");
+        tmsshipBargeOperation.setDeleteName(null);
+        tmsshipBargeOperation.setDeleteTime(null);
+        return tmsshipBargeOperationMapper.insert(tmsshipBargeOperation);
+    }
+
+    /**
+     * 通过主键查询驳船作业
+     * @param bargeOperationId
+     * @return
+     */
+    @Override
+    public TmsshipBargeOperation selectBargeOperation(BigDecimal bargeOperationId) {
+        return tmsshipBargeOperationMapper.selectByPrimaryKey(bargeOperationId);
+    }
+
+    /**
+     * 通过主键删除驳船作业
+     * @param bargeOperationId
+     * @return
+     */
+    @Override
+    public int deleteBargeOperation(BigDecimal bargeOperationId) {
+        TmsshipBargeOperation tmsshipBargeOperation = tmsshipBargeOperationMapper.selectByPrimaryKey(bargeOperationId);
+        tmsshipBargeOperation.setDeleted(new BigDecimal(1));
+        return tmsshipBargeOperationMapper.updateByPrimaryKeySelective(tmsshipBargeOperation);
+    }
+
+    /**
+     * 修改驳船作业
+     * @param tmsshipBargeOperation
+     * @return
+     */
+    @Override
+    public int updateBargeOperation(TmsshipBargeOperation tmsshipBargeOperation) {
+        tmsshipBargeOperation.setUpdateTime(new Date());
+        return tmsshipBargeOperationMapper.updateByPrimaryKeySelective(tmsshipBargeOperation);
+    }
+
+    /**
+     * 查询所有驳船作业信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectBargeOperationList(Map<String, Object> mapVal) {
+        return tmsshipBargeOperationMapper.selectBargeOperationList(mapVal);
+    }
+
+    /**
+     * 查询表单数据
+     * @param bargeOperationId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getBargeOperation(BigDecimal bargeOperationId) {
+        return tmsshipBargeOperationMapper.selectBargeOperation(bargeOperationId);
+    }
+}

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

@@ -0,0 +1,103 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+import com.steerinfo.dil.mapper.TmsshipEntryWharyResultMapper;
+import com.steerinfo.dil.service.ITmsshipEntryWharyResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * TmsshipEntryWharyResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-18 04:06
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-18
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipEntryWharyResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipEntryWharyResultService")
+public class TmsshipEntryWharyResultServiceImpl implements ITmsshipEntryWharyResultService {
+
+    @Autowired
+    TmsshipEntryWharyResultMapper tmsshipEntryWharyResultMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+
+    /**
+     * 新增抵达实绩
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public int insertEntryWharyResult(Map<String,Object> mapVal) {
+        BigDecimal orderId = new BigDecimal((Integer) mapVal.get("orderId"));
+        BigDecimal wharyId = new BigDecimal((Integer) mapVal.get("wharyId"));
+        Date resultPortDeclarationTime = (Date) mapVal.get("resultPortDeclarationTime");
+        String resultPortDeclarationName = (String) mapVal.get("resultPortDeclarationName");
+        String resultMemo = (String) mapVal.get("resultMemo");
+        Date resultArrivalTime = (Date) mapVal.get("resultArrivalTime");
+        TmsshipEntryWharyResult tmsshipEntryWharyResult = new TmsshipEntryWharyResult();
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        tmsshipEntryWharyResult.setTotalResultId(totalResultId);
+        BigDecimal resultId = selectMaxId();
+        tmsshipEntryWharyResult.setResultId(resultId);
+        LocalDate now = LocalDate.now();
+        String resultNumber = "DD" +  now.getYear();
+        Integer month = now.getMonthValue();
+        String monthStr = month.toString();
+        if (monthStr.length() != 2) {
+            resultNumber = resultNumber + "0" + now.getMonthValue();
+        }
+        else {
+            resultNumber = resultNumber + now.getMonthValue();
+        }
+        resultNumber = resultNumber + now.getDayOfMonth();
+        switch ((resultId.toString()).length()) {
+            case 1:
+                resultNumber = resultNumber + "0000" + resultId;
+                break;
+            case 2:
+                resultNumber = resultNumber + "000" + resultId;
+                break;
+            case 3:
+                resultNumber = resultNumber + "00" + resultId;
+                break;
+            case 4:
+                resultNumber = resultNumber + "0" + resultId;
+                break;
+            default:resultNumber = resultNumber + resultId;
+        }
+        tmsshipEntryWharyResult.setResultNumber(resultNumber);
+        tmsshipEntryWharyResult.setWharyId(wharyId);
+        tmsshipEntryWharyResult.setResultPortDeclarationTime(resultPortDeclarationTime);
+        tmsshipEntryWharyResult.setResultPortDeclarationName(resultPortDeclarationName);
+        tmsshipEntryWharyResult.setResultArrivalTime(resultArrivalTime);
+        tmsshipEntryWharyResult.setResultMemo(resultMemo);
+        // 设置常规字段
+        tmsshipEntryWharyResult.setInsertTime(new Date());
+        tmsshipEntryWharyResult.setUpdateTime(new Date());
+        tmsshipEntryWharyResult.setInsertUsername("admin");
+        tmsshipEntryWharyResult.setUpdateUsername("admin");
+        tmsshipEntryWharyResult.setInsertUpdateRemark("无");
+        tmsshipEntryWharyResult.setDeleteName(null);
+        tmsshipEntryWharyResult.setDeleteTime(null);
+        return tmsshipEntryWharyResultMapper.insert(tmsshipEntryWharyResult);
+    }
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return tmsshipEntryWharyResultMapper.selectMaxId();
+    }
+}

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

@@ -0,0 +1,231 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.feign.WmshboundFeign;
+import com.steerinfo.dil.mapper.TmsshipEntryWharyResultMapper;
+import com.steerinfo.dil.mapper.TmsshipOutWharyResultMapper;
+import com.steerinfo.dil.model.TmsshipEntryWharyResult;
+import com.steerinfo.dil.model.TmsshipOutWharyResult;
+import com.steerinfo.dil.util.NoUtil;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.mapper.TmsshipLoadShipResultMapper;
+import com.steerinfo.dil.service.ITmsshipLoadShipResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipLoadShipResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:47
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipLoadShipResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipLoadShipResultService")
+public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultService {
+
+    @Autowired
+    TmsshipLoadShipResultMapper tmsshipLoadShipResultMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+    @Autowired
+    TmsshipEntryWharyResultMapper tmsshipEntryWharyResultMapper;
+    @Autowired
+    TmsshipOutWharyResultMapper tmsshipOutWharyResultMapper;
+    @Autowired
+    WmshboundFeign wmshboundFeign;
+    @Autowired
+    NoUtil noUtil;
+
+    /**
+     * 新增抵港，离岗，装船实绩
+     * @param map
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertLoadShip(Map<String,Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> rowMap = (Map<String, Object>) map.get("rowMap");
+        TmsshipLoadShipResult tmsshipLoadShipResult = new TmsshipLoadShipResult();
+        TmsshipEntryWharyResult tmsshipEntryWharyResult = new TmsshipEntryWharyResult();
+        BigDecimal orderId = new BigDecimal((Integer) rowMap.get("orderId"));
+        String resultMemo = (String) mapVal.get("resultMemo");
+        BigDecimal wharyId = new BigDecimal((Integer) mapVal.get("wharyId"));
+        // 抵港
+        Date resultPortDeclarationTime = new Date((Long) mapVal.get("resultPortDeclarationTime"));
+        String resultPortDeclarationName = (String) mapVal.get("resultPortDeclarationName");
+        Date resultArrivalTime = new Date((Long)mapVal.get("resultArrivalTime"));
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        tmsshipEntryWharyResult.setTotalResultId(totalResultId);
+        BigDecimal resultEntryId = tmsshipEntryWharyResultMapper.selectMaxId();
+        tmsshipEntryWharyResult.setResultId(resultEntryId);
+        String resultEntryNumber = noUtil.setResultNo("DG",resultEntryId);
+        tmsshipEntryWharyResult.setResultNumber(resultEntryNumber);
+        tmsshipEntryWharyResult.setWharyId(wharyId);
+        tmsshipEntryWharyResult.setResultPortDeclarationTime(resultPortDeclarationTime);
+        tmsshipEntryWharyResult.setResultPortDeclarationName(resultPortDeclarationName);
+        tmsshipEntryWharyResult.setResultArrivalTime(resultArrivalTime);
+        tmsshipEntryWharyResult.setResultMemo(resultMemo);
+        // 设置常规字段
+        tmsshipEntryWharyResult.setInsertTime(new Date());
+        tmsshipEntryWharyResult.setUpdateTime(new Date());
+        tmsshipEntryWharyResult.setInsertUsername("admin");
+        tmsshipEntryWharyResult.setUpdateUsername("admin");
+        tmsshipEntryWharyResult.setInsertUpdateRemark("无");
+        tmsshipEntryWharyResult.setDeleteName(null);
+        tmsshipEntryWharyResult.setDeleteTime(null);
+        // 离港
+        String resultOutWharyName = (String) mapVal.get("resultOutWharyName");
+        Date resultOutWharyTime = new Date((Long) mapVal.get("resultOutWharyTime"));
+        TmsshipOutWharyResult tmsshipOutWharyResult = new TmsshipOutWharyResult();
+        tmsshipOutWharyResult.setTotalResultId(totalResultId);
+        BigDecimal resultOutId = tmsshipOutWharyResultMapper.selectMaxId();
+        tmsshipOutWharyResult.setResultId(resultOutId);
+        String resultOutNumber = noUtil.setResultNo("LG",resultOutId);
+        tmsshipOutWharyResult.setResultNumber(resultOutNumber);
+        tmsshipOutWharyResult.setWharyId(wharyId);
+        tmsshipOutWharyResult.setResultOutWharyTime(resultOutWharyTime);
+        tmsshipOutWharyResult.setResultOutWharyName(resultOutWharyName);
+        tmsshipOutWharyResult.setResultMemo(resultMemo);
+        // 设置常规字段
+        tmsshipOutWharyResult.setInsertTime(new Date());
+        tmsshipOutWharyResult.setUpdateTime(new Date());
+        tmsshipOutWharyResult.setInsertUsername("admin");
+        tmsshipOutWharyResult.setUpdateUsername("admin");
+        tmsshipOutWharyResult.setInsertUpdateRemark("无");
+        tmsshipOutWharyResult.setDeleteName(null);
+        tmsshipOutWharyResult.setDeleteTime(null);
+        // 装船
+        BigDecimal resultId = tmsshipLoadShipResultMapper.selectMaxId();
+        BigDecimal locationStartPortId = new BigDecimal((Integer) mapVal.get("locationStartPortId"));
+        BigDecimal arrivalPortId = new BigDecimal((Integer) mapVal.get("arrivalPortId"));
+        BigDecimal batchId = getBatchId(rowMap);
+        Date resultDeliveryDate = new Date((Long) mapVal.get("resultDeliveryDate"));
+        BigDecimal resultActualInstallations = new BigDecimal((String) mapVal.get("resultActualInstallations"));
+        BigDecimal rwarehouseMaterialId = new BigDecimal((Integer) mapVal.get("rwarehouseMaterialId"));
+        Date resultLoadShipDate = new Date((Long) mapVal.get("resultLoadShipDate"));
+        String resultIsClear = (String) mapVal.get("resultIsClear");
+        String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
+        tmsshipLoadShipResult.setResultId(resultId);
+        tmsshipLoadShipResult.setTotalResultId(totalResultId);
+        tmsshipLoadShipResult.setLocationStartPortId(locationStartPortId);
+        tmsshipLoadShipResult.setArrivalPortId(arrivalPortId);
+        tmsshipLoadShipResult.setBatchId(batchId);
+        tmsshipLoadShipResult.setResultDeliveryDate(resultDeliveryDate);
+        tmsshipLoadShipResult.setResultActualInstallations(resultActualInstallations);
+        tmsshipLoadShipResult.setResultNumber(resultNumber);
+        tmsshipLoadShipResult.setRwarehouseMaterialId(rwarehouseMaterialId);
+        tmsshipLoadShipResult.setResultArrivalPortTime(resultArrivalTime);
+        tmsshipLoadShipResult.setResultOutPortTime(resultOutWharyTime);
+        tmsshipLoadShipResult.setResultLoadShipDate(resultLoadShipDate);
+        tmsshipLoadShipResult.setResultIsclear(resultIsClear);
+        // 设置常规字段
+        tmsshipLoadShipResult.setInsertTime(new Date());
+        tmsshipLoadShipResult.setInsertUsername("admin");
+        tmsshipLoadShipResult.setInsertUpdateRemark("无");
+        tmsshipLoadShipResult.setDeleteName(null);
+        tmsshipLoadShipResult.setDeleteTime(null);
+        tmsshipLoadShipResult.setUpdateTime(new Date());
+        tmsshipLoadShipResult.setUpdateUsername("admin");
+        tmsshipLoadShipResult.setDeleted(new BigDecimal(0));
+        tmsshipEntryWharyResultMapper.insert(tmsshipEntryWharyResult);
+        tmsshipOutWharyResultMapper.insert(tmsshipOutWharyResult);
+        // 新增出库实绩
+        Map<String,Object> mapValue = new HashMap<>();
+        mapValue.put("batchId",batchId);
+        mapValue.put("portId",locationStartPortId);
+        mapValue.put("resultTonnage",resultActualInstallations);
+        mapValue.put("isClean",resultIsClear);
+        wmshboundFeign.addResult(mapValue);
+        int codeLoad = tmsshipLoadShipResultMapper.insert(tmsshipLoadShipResult);
+        return codeLoad;
+    }
+
+    /**
+     * 根据主键删除装船
+     * @param resultId
+     * @return
+     */
+    @Override
+    public int deleteLoadShip(BigDecimal resultId) {
+        TmsshipLoadShipResult tmsshipLoadShipResult = selectLoadShip(resultId);
+        tmsshipLoadShipResult.setDeleted(new BigDecimal(1));
+        return tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
+    }
+
+    /**
+     * 根据主键查询装船
+     * @param resultId
+     * @return
+     */
+    @Override
+    public TmsshipLoadShipResult selectLoadShip(BigDecimal resultId) {
+        return tmsshipLoadShipResultMapper.selectByPrimaryKey(resultId);
+    }
+
+    /**
+     * 根据主键修改
+     * @param tmsshipLoadShipResult
+     * @return
+     */
+    @Override
+    public int updateLoadShip(TmsshipLoadShipResult tmsshipLoadShipResult) {
+        tmsshipLoadShipResult.setUpdateTime(new Date());
+        return tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
+    }
+
+    /**
+     * 查询所有装船信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectLoadShipList(Map<String, Object> mapVal) {
+        return tmsshipLoadShipResultMapper.selectLoadShipList(mapVal);
+    }
+
+    /**
+     * 查询一条装船指令下的总重量
+     * @param instructionsId
+     * @return
+     */
+    @Override
+    public BigDecimal selectAllWeight(BigDecimal instructionsId) {
+        return tmsshipLoadShipResultMapper.selectAllWeight(instructionsId);
+    }
+
+    /**
+     * 查询装船表单
+     * @param resultId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getLoadShip(BigDecimal resultId) {
+        return tmsshipLoadShipResultMapper.selectLoadShip(resultId);
+    }
+
+    /**
+     * 根据物资名称和外轮船名得到批次
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public BigDecimal getBatchId(Map<String, Object> mapVal) {
+        return tmsshipLoadShipResultMapper.getBatchId(mapVal);
+    }
+}

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

@@ -0,0 +1,97 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipOutWharyResult;
+import com.steerinfo.dil.mapper.TmsshipOutWharyResultMapper;
+import com.steerinfo.dil.service.ITmsshipOutWharyResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * TmsshipOutWharyResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:50
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipOutWharyResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipOutWharyResultService")
+public class TmsshipOutWharyResultServiceImpl implements ITmsshipOutWharyResultService {
+
+    @Autowired
+    TmsshipOutWharyResultMapper tmsshipOutWharyResultMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return tmsshipOutWharyResultMapper.selectMaxId();
+    }
+
+    @Override
+    public int insertOutWharyResult(Map<String, Object> mapVal) {
+        BigDecimal orderId = new BigDecimal((Integer) mapVal.get("orderId"));
+        BigDecimal wharyId = new BigDecimal((Integer) mapVal.get("wharyId"));
+        String resultOutWharyName = (String) mapVal.get("resultOutWharyName");
+        String resultMemo = (String) mapVal.get("resultMemo");
+        Date resultOutWharyTime = (Date) mapVal.get("resultOutWharyTime");
+        TmsshipOutWharyResult tmsshipOutWharyResult = new TmsshipOutWharyResult();
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        tmsshipOutWharyResult.setTotalResultId(totalResultId);
+        BigDecimal resultId = selectMaxId();
+        tmsshipOutWharyResult.setResultId(resultId);
+        LocalDate now = LocalDate.now();
+        String resultNumber = "LG" +  now.getYear();
+        Integer month = now.getMonthValue();
+        String monthStr = month.toString();
+        if (monthStr.length() != 2) {
+            resultNumber = resultNumber + "0" + now.getMonthValue();
+        }
+        else {
+            resultNumber = resultNumber + now.getMonthValue();
+        }
+        resultNumber = resultNumber + now.getDayOfMonth();
+        switch ((resultId.toString()).length()) {
+            case 1:
+                resultNumber = resultNumber + "0000" + resultId;
+                break;
+            case 2:
+                resultNumber = resultNumber + "000" + resultId;
+                break;
+            case 3:
+                resultNumber = resultNumber + "00" + resultId;
+                break;
+            case 4:
+                resultNumber = resultNumber + "0" + resultId;
+                break;
+            default:resultNumber = resultNumber + resultId;
+        }
+        tmsshipOutWharyResult.setResultNumber(resultNumber);
+        tmsshipOutWharyResult.setWharyId(wharyId);
+        tmsshipOutWharyResult.setResultOutWharyTime(resultOutWharyTime);
+        tmsshipOutWharyResult.setResultOutWharyName(resultOutWharyName);
+        tmsshipOutWharyResult.setResultMemo(resultMemo);
+        // 设置常规字段
+        tmsshipOutWharyResult.setInsertTime(new Date());
+        tmsshipOutWharyResult.setUpdateTime(new Date());
+        tmsshipOutWharyResult.setInsertUsername("admin");
+        tmsshipOutWharyResult.setUpdateUsername("admin");
+        tmsshipOutWharyResult.setInsertUpdateRemark("无");
+        tmsshipOutWharyResult.setDeleteName(null);
+        tmsshipOutWharyResult.setDeleteTime(null);
+        return tmsshipOutWharyResultMapper.insert(tmsshipOutWharyResult);
+    }
+
+
+}

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

@@ -0,0 +1,133 @@
+package com.steerinfo.dil.service.impl;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.steerinfo.dil.model.TmsshipTotalResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.mapper.TmsshipShipLocationMapper;
+import com.steerinfo.dil.service.ITmsshipShipLocationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipShipLocation服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:52
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipShipLocation服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipShipLocationService")
+public class TmsshipShipLocationServiceImpl implements ITmsshipShipLocationService {
+
+    @Autowired
+    TmsshipShipLocationMapper tmsshipShipLocationMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+
+
+    @Override
+    public BigDecimal selectMaxId() {
+        return tmsshipShipLocationMapper.selectMaxId();
+    }
+
+    /**
+     * 删除位置作业
+     * @param locationId
+     * @return
+     */
+    @Override
+    public int deleteShipLocation(BigDecimal locationId) {
+        TmsshipShipLocation tmsshipShipLocation = tmsshipShipLocationMapper.selectByPrimaryKey(locationId);
+        tmsshipShipLocation.setDeleted(new BigDecimal(1));
+        return tmsshipShipLocationMapper.updateByPrimaryKeySelective(tmsshipShipLocation);
+    }
+
+    /**
+     * 添加位置作业
+     * @param map
+     * @return
+     */
+    @Override
+    public int addShipLocation(Map<String,Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> shipLocationMap = (Map<String, Object>) map.get("shipLocationMap");
+        BigDecimal orderId = new BigDecimal((Integer) shipLocationMap.get("orderId"));
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        String locationValue = (String) mapVal.get("locationValue");
+        Long locationRouteTimeLong = (Long) mapVal.get("locationRouteTime");
+        Date locationRouteTime = new Date(locationRouteTimeLong);
+        String locationMemo = (String)mapVal.get("locationMemo");
+        String locationStatus = (String)mapVal.get("locationStatus");
+        BigDecimal locationId = selectMaxId();
+        TmsshipShipLocation tmsshipShipLocation = new TmsshipShipLocation();
+        tmsshipShipLocation.setLocationId(locationId);
+        tmsshipShipLocation.setTotalResultId(totalResultId);
+        tmsshipShipLocation.setLocationValue(locationValue);
+        tmsshipShipLocation.setLocationRouteTime(locationRouteTime);
+        tmsshipShipLocation.setLocationMemo(locationMemo);
+        tmsshipShipLocation.setLocationStatus(locationStatus);
+        // 设置常规字段
+        tmsshipShipLocation.setDeleted(new BigDecimal(0));
+        tmsshipShipLocation.setInsertTime(new Date());
+        tmsshipShipLocation.setInsertUsername("admin");
+        tmsshipShipLocation.setInsertUpdateRemark("无");
+        tmsshipShipLocation.setDeleteName(null);
+        tmsshipShipLocation.setDeleteTime(null);
+        tmsshipShipLocation.setUpdateTime(new Date());
+        tmsshipShipLocation.setUpdateUsername("admin");
+        return tmsshipShipLocationMapper.insert(tmsshipShipLocation);
+    }
+
+    /**
+     * 查询位置作业详情
+     * @param locationId
+     * @return
+     */
+    @Override
+    public TmsshipShipLocation selectShipLocation(BigDecimal locationId) {
+        return tmsshipShipLocationMapper.selectByPrimaryKey(locationId);
+    }
+
+    /**
+     * 修改位置作业
+     * @param tmsshipShipLocation
+     * @return
+     */
+    @Override
+    public int updateShipLocation(TmsshipShipLocation tmsshipShipLocation) {
+        tmsshipShipLocation.setUpdateTime(new Date());
+        return tmsshipShipLocationMapper.updateByPrimaryKeySelective(tmsshipShipLocation);
+    }
+
+    /**
+     * 查看所有位置作业信息
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectShipLocationList(Map<String,Object> mapVal) {
+        return tmsshipShipLocationMapper.selectShipLocationList(mapVal);
+    }
+
+    /**
+     * 查看位置作业表单数据
+     * @param locationId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getShipLocation(BigDecimal locationId) {
+        return tmsshipShipLocationMapper.selectShipLocation(locationId);
+    }
+}

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

@@ -0,0 +1,93 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmsshipTotalResult;
+import com.steerinfo.dil.mapper.TmsshipTotalResultMapper;
+import com.steerinfo.dil.service.ITmsshipTotalResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipTotalResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:55
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipTotalResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service
+public class TmsshipTotalResultServiceImpl implements ITmsshipTotalResultService {
+
+    @Autowired
+    TmsshipTotalResultMapper tmsshipTotalResultMapper;
+
+    /**
+     * 得到一个总实绩id
+     * @param orderId
+     * @return
+     */
+    @Override
+    public BigDecimal selectTotalId(BigDecimal orderId) {
+        return tmsshipTotalResultMapper.selectResultTotalId(orderId);
+    }
+
+    /**
+     * 逻辑获取一个总实绩id
+     * @param orderId
+     * @return
+     */
+    @Override
+    public BigDecimal getResultTotalId(BigDecimal orderId) {
+        BigDecimal resultTotalId = selectTotalId(orderId);
+        if (resultTotalId == null) {
+            TmsshipTotalResult tmsshipTotalResult = new TmsshipTotalResult();
+            BigDecimal totalId = tmsshipTotalResultMapper.selectMaxId();
+            tmsshipTotalResult.setResultId(totalId);
+            tmsshipTotalResult.setOrderId(orderId);
+            tmsshipTotalResult.setResultDuration(null);
+            tmsshipTotalResult.setStandardDataId(new BigDecimal(1004));
+            tmsshipTotalResult.setResultOutlier(null);
+            // 插入常规字段
+            tmsshipTotalResult.setInsertTime(new Date());
+            tmsshipTotalResult.setUpdateTime(new Date());
+            tmsshipTotalResult.setInsertUsername("admin");
+            tmsshipTotalResult.setUpdateUsername("admin");
+            tmsshipTotalResult.setInsertUpdateRemark("无");
+            tmsshipTotalResultMapper.insert(tmsshipTotalResult);
+        }
+        return selectTotalId(orderId);
+    }
+
+    /**
+     * 展示水路货物运单
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getOrderList(Map<String,Object> mapVal) {
+        return tmsshipTotalResultMapper.selectOrderList(mapVal);
+    }
+
+    /**
+     * 展示船只信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getCapacity(Map<String, Object> mapVal) {
+        return tmsshipTotalResultMapper.getCapacity(mapVal);
+    }
+
+
+}

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

@@ -0,0 +1,154 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.feign.WmshboundFeign;
+import com.steerinfo.dil.mapper.TmsshipLoadShipResultMapper;
+import com.steerinfo.dil.model.TmsshipLoadShipResult;
+import com.steerinfo.dil.model.TmsshipUnloadShipResult;
+import com.steerinfo.dil.mapper.TmsshipUnloadShipResultMapper;
+import com.steerinfo.dil.service.ITmsshipUnloadShipResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipUnloadShipResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 08:57
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipUnloadShipResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipUnloadShipResultService")
+public class TmsshipUnloadShipResultServiceImpl implements ITmsshipUnloadShipResultService {
+
+    @Autowired
+    TmsshipUnloadShipResultMapper tmsshipUnloadShipResultMapper;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+    @Autowired
+    TmsshipLoadShipResultMapper tmsshipLoadShipResultMapper;
+    @Autowired
+    WmshboundFeign wmshboundFeign;
+
+
+    /**
+     * 得到最大id
+     * @return
+     */
+    @Override
+    public BigDecimal selectMaxId() {
+        return tmsshipUnloadShipResultMapper.selectMaxId();
+    }
+
+    /**
+     * 新增卸船实绩
+     * @param map
+     * @return
+     */
+    @Override
+    @Transactional
+    public int insertUnloadShip(Map<String, Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> unloadMap = (Map<String, Object>) map.get("unloadMap");
+        TmsshipUnloadShipResult tmsshipUnloadShipResult = new TmsshipUnloadShipResult();
+        BigDecimal resultId = selectMaxId();
+        BigDecimal orderId = new BigDecimal((Integer) unloadMap.get("orderId"));
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        Date resultArrivalDate = new Date((Long) mapVal.get("resultArrivalDate"));
+        Date resultStartTime = new Date((Long) mapVal.get("resultStartTime"));
+        Date resultEndTime = new Date((Long) mapVal.get("resultEndTime"));
+        String resultStatus = (String) mapVal.get("resultStatus");
+        // 设置属性值
+        tmsshipUnloadShipResult.setResultId(resultId);
+        tmsshipUnloadShipResult.setTotalResultId(totalResultId);
+        tmsshipUnloadShipResult.setResultArrivalDate(resultArrivalDate);
+        tmsshipUnloadShipResult.setResultStartTime(resultStartTime);
+        tmsshipUnloadShipResult.setResultEndTime(resultEndTime);
+        tmsshipUnloadShipResult.setResultStatus(resultStatus);
+        // 设置常规字段
+        tmsshipUnloadShipResult.setDeleteName(null);
+        tmsshipUnloadShipResult.setDeleteTime(null);
+        tmsshipUnloadShipResult.setInsertTime(new Date());
+        tmsshipUnloadShipResult.setUpdateTime(new Date());
+        tmsshipUnloadShipResult.setInsertUsername("admin");
+        tmsshipUnloadShipResult.setUpdateUsername("admin");
+        tmsshipUnloadShipResult.setInsertUpdateRemark("无");
+        tmsshipUnloadShipResult.setDeleted(new BigDecimal(0));
+        // 新增出库实绩
+        Map<String,Object> totalId = new HashMap<>();
+        totalId.put("totalResultId",totalResultId);
+        List<TmsshipLoadShipResult> tmsshipLoadShipResults = tmsshipLoadShipResultMapper.selectByParameters(totalId);
+        TmsshipLoadShipResult tmsshipLoadShipResult = tmsshipLoadShipResults.get(0);
+        Map<String,Object> mapValue = new HashMap<>();
+        mapValue.put("batchId",tmsshipLoadShipResult.getBatchId());
+        mapValue.put("portId",tmsshipLoadShipResult.getArrivalPortId());
+        mapValue.put("resultMaterialNumber",tmsshipLoadShipResult.getResultActualInstallations());
+        wmshboundFeign.addWarehousingResult(mapValue);
+        return tmsshipUnloadShipResultMapper.insert(tmsshipUnloadShipResult);
+    }
+
+    /**
+     * 通过主键删除卸船实绩
+     * @param resultId
+     * @return
+     */
+    @Override
+    public int deleteUnloadShip(BigDecimal resultId) {
+        TmsshipUnloadShipResult tmsshipUnloadShipResult = selectUnloadShip(resultId);
+        tmsshipUnloadShipResult.setDeleted(new BigDecimal(1));
+        return tmsshipUnloadShipResultMapper.updateByPrimaryKeySelective(tmsshipUnloadShipResult);
+    }
+
+    /**
+     * 通过主键查询卸船
+     * @param resultId
+     * @return
+     */
+    @Override
+    public TmsshipUnloadShipResult selectUnloadShip(BigDecimal resultId) {
+        return tmsshipUnloadShipResultMapper.selectByPrimaryKey(resultId);
+    }
+
+    /**
+     * 修改卸船信息
+     * @param tmsshipUnloadShipResult
+     * @return
+     */
+    @Override
+    public int updateUnloadShip(TmsshipUnloadShipResult tmsshipUnloadShipResult) {
+        tmsshipUnloadShipResult.setUpdateTime(new Date());
+        return tmsshipUnloadShipResultMapper.updateByPrimaryKeySelective(tmsshipUnloadShipResult);
+    }
+
+    /**
+     * 查询所有卸船实绩信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectUnloadShipList(Map<String, Object> mapVal) {
+        return tmsshipUnloadShipResultMapper.selectUnloadShipList(mapVal);
+    }
+
+    /**
+     * 得到卸船作业表单
+     * @param resultId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getUnloadShip(BigDecimal resultId) {
+        return tmsshipUnloadShipResultMapper.selectUnloadShip(resultId);
+    }
+}

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

@@ -0,0 +1,182 @@
+package com.steerinfo.dil.service.impl;
+import com.steerinfo.dil.model.TmsshipWaterQualityResult;
+import com.steerinfo.dil.mapper.TmsshipWaterQualityResultMapper;
+import com.steerinfo.dil.service.ITmsshipWaterQualityResultService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsshipWaterQualityResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-08-19 09:01
+ * 类描述
+ * 修订历史：
+ * 日期：2021-08-19
+ * 作者：generator
+ * 参考：
+ * 描述：TmsshipWaterQualityResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmsshipWaterQualityResultService")
+public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualityResultService {
+
+    @Autowired
+    TmsshipWaterQualityResultMapper tmsshipWaterQualityResultMapper;
+    @Autowired
+    TmsshipLoadShipResultServiceImpl tmsshipLoadShipResultService;
+    @Autowired
+    TmsshipTotalResultServiceImpl tmsshipTotalResultService;
+
+    /**
+     * 查询最大id
+     * @return
+     */
+    @Override
+    public BigDecimal selectMaxId() {
+        return tmsshipWaterQualityResultMapper.selectMaxId();
+    }
+
+    /**
+     * 新增水分检测
+     * @param map
+     * @return
+     */
+    @Override
+    public int insertWaterQualityResult(Map<String,Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> waterQualityMap = (Map<String, Object>) map.get("waterQualityMap");
+        TmsshipWaterQualityResult tmsshipWaterQualityResult = new TmsshipWaterQualityResult();
+        BigDecimal resultId = selectMaxId();
+        BigDecimal orderId = new BigDecimal((Integer) waterQualityMap.get("orderId"));
+        BigDecimal instructionsId = selectInstructionsId(orderId);
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        Date resultPlannedDate = new Date((Long) mapVal.get("resultPlannedDate"));
+        Date resultCargoRightsDate = new Date((Long) mapVal.get("resultCargoRightsDate"));
+        BigDecimal resultEmptyHeavyWaterMeter = new BigDecimal((String) mapVal.get("resultEmptyHeavyWaterMeter"));
+        BigDecimal weights = tmsshipLoadShipResultService.selectAllWeight(instructionsId);
+        BigDecimal resultActualInstallations = selectRealWeight(totalResultId);
+        Double ratio = resultActualInstallations.doubleValue()/weights.doubleValue();
+        String strRatio = ratio.toString();
+        String shipmentRatio;
+        if (strRatio.length() < 7) {
+            shipmentRatio = strRatio;
+        }
+        else {
+            shipmentRatio = strRatio.substring(0, 6);
+        }
+        BigDecimal resultShipmentRatio = new BigDecimal(shipmentRatio);
+        Date resultEsDeliveryDate = new Date((Long) mapVal.get("resultEsDeliveryDate"));
+        BigDecimal resultWaterTonnage = new BigDecimal((String) mapVal.get("resultWaterTonnage"));
+        BigDecimal resultInspectionFees = new BigDecimal((String) mapVal.get("resultInspectionFees"));
+        Double content = resultWaterTonnage.doubleValue()/resultActualInstallations.doubleValue();
+        String strContent = content.toString();
+        String moistureContent;
+        if (strContent.length() < 7) {
+            moistureContent = strContent;
+        }
+        else {
+            moistureContent = strContent.substring(0, 6);
+        }
+        BigDecimal resultMoistureContent = new BigDecimal(moistureContent);
+        // 设置对象属性值
+        tmsshipWaterQualityResult.setResultId(resultId);
+        tmsshipWaterQualityResult.setTotalResultId(totalResultId);
+        tmsshipWaterQualityResult.setResultPlannedDate(resultPlannedDate);
+        tmsshipWaterQualityResult.setResultCargoRightsDate(resultCargoRightsDate);
+        tmsshipWaterQualityResult.setResultShipmentRatio(resultShipmentRatio);
+        tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultEmptyHeavyWaterMeter);
+        tmsshipWaterQualityResult.setResultMoistureContent(resultMoistureContent);
+        tmsshipWaterQualityResult.setResultWaterTonnage(resultWaterTonnage);
+        tmsshipWaterQualityResult.setResultInspectionFees(resultInspectionFees);
+        tmsshipWaterQualityResult.setResultEsDeliveryDate(resultEsDeliveryDate);
+        // 设置常规字段
+        tmsshipWaterQualityResult.setInsertTime(new Date());
+        tmsshipWaterQualityResult.setInsertUsername("admin");
+        tmsshipWaterQualityResult.setInsertUpdateRemark("无");
+        tmsshipWaterQualityResult.setUpdateTime(new Date());
+        tmsshipWaterQualityResult.setUpdateUsername("admin");
+        tmsshipWaterQualityResult.setDeleteName(null);
+        tmsshipWaterQualityResult.setDeleteTime(null);
+        tmsshipWaterQualityResult.setDeleted(new BigDecimal(0));
+        return tmsshipWaterQualityResultMapper.insert(tmsshipWaterQualityResult);
+    }
+
+    /**
+     * 通过主键删除水分质检
+     * @param resultId
+     * @return
+     */
+    @Override
+    public int deleteWaterQualityResult(BigDecimal resultId) {
+        TmsshipWaterQualityResult tmsshipWaterQualityResult = selectWaterQualityResult(resultId);
+        tmsshipWaterQualityResult.setDeleted(new BigDecimal(1));
+        return tmsshipWaterQualityResultMapper.updateByPrimaryKeySelective(tmsshipWaterQualityResult);
+    }
+
+    /**
+     * 通过主键查询水分质检
+     * @param resultId
+     * @return
+     */
+    @Override
+    public TmsshipWaterQualityResult selectWaterQualityResult(BigDecimal resultId) {
+        return tmsshipWaterQualityResultMapper.selectByPrimaryKey(resultId);
+    }
+
+    /**
+     * 修改水分质检信息
+     * @param tmsshipWaterQualityResult
+     * @return
+     */
+    @Override
+    public int updateWaterQualityResult(TmsshipWaterQualityResult tmsshipWaterQualityResult) {
+        tmsshipWaterQualityResult.setUpdateTime(new Date());
+        return tmsshipWaterQualityResultMapper.updateByPrimaryKeySelective(tmsshipWaterQualityResult);
+    }
+
+    /**
+     * 查询所有水分质检信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> selectWaterQualityList(Map<String, Object> mapVal) {
+        return tmsshipWaterQualityResultMapper.selectWaterQualityList(mapVal);
+    }
+
+    /**
+     * 查询所有水分质检表单
+     * @param resultId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getWaterQuality(BigDecimal resultId) {
+        return tmsshipWaterQualityResultMapper.selectWaterQuality(resultId);
+    }
+
+    /**
+     * 通过总实绩id查询装船的实际重量
+     * @param totalResultId
+     * @return
+     */
+    @Override
+    public BigDecimal selectRealWeight(BigDecimal totalResultId) {
+        return tmsshipWaterQualityResultMapper.selectRealWeight(totalResultId);
+    }
+
+    /**
+     * 通过子表id查询指令id
+     * @param orderId
+     * @return
+     */
+    @Override
+    public BigDecimal selectInstructionsId(BigDecimal orderId) {
+        return tmsshipWaterQualityResultMapper.selectInstructionsId(orderId);
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.controller.BaseController;
+import com.steerinfo.framework.controller.RESTfulResult;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/7/8 11:33
+ * @Version 1.0
+ */
+public class BaseRESTfulController extends BaseController {
+    public BaseRESTfulController() {
+    }
+
+    protected RESTfulResult success() {
+        RESTfulResult result = new RESTfulResult();
+        result.setSucceed();
+        result.setMessage(result.getResultMessage());
+        result.setData(true);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj) {
+        RESTfulResult result = new RESTfulResult();
+        result.setSucceed();
+        result.setMessage(result.getResultMessage());
+        result.setData(obj);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj, String msg) {
+        RESTfulResult result = this.success(obj);
+        result.setMessage(msg);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult success(Object obj, String code, String msg) {
+        RESTfulResult result = this.success(obj, msg);
+        result.setCode(code);
+        result.setCode("200");
+        return result;
+    }
+
+    protected RESTfulResult failed() {
+        return this.failed((Object)null);
+    }
+
+    protected RESTfulResult failed(Object obj) {
+        RESTfulResult result = new RESTfulResult("201", (String)null);
+        result.setMessage(result.getResultMessage());
+        result.setData(obj);
+        return result;
+    }
+
+    protected RESTfulResult failed(Object obj, String msg) {
+        RESTfulResult result = new RESTfulResult("201", msg);
+        result.setData(obj);
+        return result;
+    }
+    protected RESTfulResult failed(Integer coe, String msg) {
+        RESTfulResult result = new RESTfulResult(coe.toString(), msg);
+        return result;
+    }
+
+    protected RESTfulResult failed(Object obj, String code, String msg) {
+        RESTfulResult result = this.failed(obj, msg);
+        result.setCode(code);
+        return result;
+    }
+}

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.dil.feign.ColumnDataFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+public class ColumnDataUtil {
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
+    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/9/8 15:29
+ * @Version:V2.0
+ */
+@Component
+public class NoUtil {
+
+    public String setResultNo(String noStr,BigDecimal resultId) {
+        LocalDate now = LocalDate.now();
+        String resultNo = noStr +  now.getYear();
+        Integer month = now.getMonthValue();
+        String monthStr = month.toString();
+        Integer day = now.getDayOfMonth();
+        String dayStr = day.toString();
+        if (monthStr.length() != 2) {
+            resultNo = resultNo + "0" + now.getMonthValue();
+        }
+        else {
+            resultNo = resultNo + now.getMonthValue();
+        }
+        if (dayStr.length() != 2) {
+            resultNo = resultNo + "0" + now.getDayOfMonth();
+        }
+        else {
+            resultNo = resultNo + now.getDayOfMonth();
+        }
+        switch ((resultId.toString()).length()) {
+            case 1:
+                resultNo = resultNo + "0000" + resultId;
+                break;
+            case 2:
+                resultNo = resultNo + "000" + resultId;
+                break;
+            case 3:
+                resultNo = resultNo + "00" + resultId;
+                break;
+            case 4:
+                resultNo = resultNo + "0" + resultId;
+                break;
+            default:resultNo = resultNo + resultId;
+        }
+        return resultNo;
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.framework.service.pagehelper.PageList;
+
+import java.util.List;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/6/7 14:31
+ * @Version 1.0
+ */
+public class PageListAdd<T> extends PageList<T> {
+    public PageListAdd() {
+    }
+
+    public PageListAdd(List<T> list) {
+        super(list, 20);
+    }
+
+    public PageListAdd(List<T> list, int navigatePages) {
+        super(list, navigatePages);
+    }
+
+    private Object columnData;
+
+    public Object getColumnData() {
+        return columnData;
+    }
+
+    public void setColumnData(Object columnData) {
+        this.columnData = columnData;
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.steerinfo.dil.util;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/5/26 8:59
+ * @Version 1.0
+ * 工具类
+ */
+public class util {
+
+}

src/main/resources/application-dev.yml

@@ -0,0 +1,9 @@
+spring:
+  datasource:
+    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
+    password: st#0901
+    username: dil0901
+    driver-class-name: oracle.jdbc.OracleDriver
+  application:
+    name: dil-shiptms-api-dev
+

src/main/resources/application-prod.yml

@@ -0,0 +1,8 @@
+spring:
+  datasource:
+    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
+    password: dil
+    username: dil
+    driver-class-name: oracle.jdbc.OracleDriver
+  application:
+    name: dil-shiptms-api-dev

src/main/resources/bootstrap.yml

@@ -0,0 +1,50 @@
+api.version: api/v1/shipTms
+spring:
+  profiles:
+    include: ${SPRING_PROFILES:dev}
+  jackson:
+        date-format: yyyy-MM-dd HH:mm:ss
+        time-zone: GMT+8
+#    serialization: {WRITE_DATES_AS_TIMESTAMPS: true}
+  messages:
+    basename: message
+    encoding: UTF-8
+  mvc:
+    static-path-pattern:
+
+#eureka设置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://root:root@discovery.steerinfo.com/eureka/
+
+genxml:
+  pth: com/a
+cache:
+  level: 2
+redis:
+  host: 10.10.50.28
+  port: 6379
+  pwd: 123456
+  project:
+    prefix: sysmanage
+  pool:
+    maxTotal: 8
+    maxWaitMillis: 1000
+    maxIdle: 8
+  cache:
+    time: 864000000
+  database: 0
+
+
+
+mybatis:
+  type-aliases-package: com.steerinfo.dil.model
+  mapper-locations: classpath:com/steerinfo/dil/mapper/*.xml
+  configuration:
+    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    mapUnderscoreToCamelCase: true
+    call-setters-on-nulls: true
+
+server:
+  port: 8090

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

@@ -0,0 +1,722 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsshipCargoTransferResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipCargoTransferResult">
+        <id column="CARGO_TRANSFER_RESULT_ID" jdbcType="DECIMAL" property="cargoTransferResultId"/>
+        <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber"/>
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId"/>
+        <result column="RESULT_CONTACT_PERSON" jdbcType="VARCHAR" property="resultContactPerson"/>
+        <result column="RESULT_TELEPHONE_FAX" jdbcType="VARCHAR" property="resultTelephoneFax"/>
+        <result column="GROUP_ID" jdbcType="DECIMAL" property="groupId"/>
+        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
+        <result column="RESULT_NUMBER_OF_LOANS" jdbcType="DECIMAL" property="resultNumberOfLoans"/>
+        <result column="RESULT_FREIGHT_FORWARDING_INFO" jdbcType="VARCHAR" property="resultFreightForwardingInfo"/>
+        <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo"/>
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
+        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        CARGO_TRANSFER_RESULT_ID, RESULT_NUMBER, CARRIER_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
+    GROUP_ID, BATCH_ID, RESULT_NUMBER_OF_LOANS, RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.CARGO_TRANSFER_RESULT_ID, t.RESULT_NUMBER, t.CARRIER_ID, t.RESULT_CONTACT_PERSON,
+    t.RESULT_TELEPHONE_FAX, t.GROUP_ID, t.BATCH_ID, t.RESULT_NUMBER_OF_LOANS, t.RESULT_FREIGHT_FORWARDING_INFO,
+    t.RESULT_MEMO, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM AMSSHIP_CARGO_TRANSFER_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMSSHIP_CARGO_TRANSFER_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="cargoTransferResultId != null">
+                and CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
+            </if>
+            <if test="resultNumber != null and resultNumber != ''">
+                and RESULT_NUMBER = #{resultNumber}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="resultContactPerson != null and resultContactPerson != ''">
+                and RESULT_CONTACT_PERSON = #{resultContactPerson}
+            </if>
+            <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
+                and RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
+            </if>
+            <if test="groupId != null">
+                and GROUP_ID = #{groupId}
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="resultNumberOfLoans != null">
+                and RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
+            </if>
+            <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
+                and RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
+            </if>
+            <if test="resultMemo != null and resultMemo != ''">
+                and RESULT_MEMO = #{resultMemo}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME = #{deleteName}
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME = #{deleteTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="cargoTransferResultId != null">
+                and CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
+            </if>
+            <if test="resultNumber != null and resultNumber != ''">
+                and RESULT_NUMBER LIKE '%${resultNumber}%'
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="resultContactPerson != null and resultContactPerson != ''">
+                and RESULT_CONTACT_PERSON LIKE '%${resultContactPerson}%'
+            </if>
+            <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
+                and RESULT_TELEPHONE_FAX LIKE '%${resultTelephoneFax}%'
+            </if>
+            <if test="groupId != null">
+                and GROUP_ID = #{groupId}
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="resultNumberOfLoans != null">
+                and RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
+            </if>
+            <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
+                and RESULT_FREIGHT_FORWARDING_INFO LIKE '%${resultFreightForwardingInfo}%'
+            </if>
+            <if test="resultMemo != null and resultMemo != ''">
+                and RESULT_MEMO LIKE '%${resultMemo}%'
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME LIKE '%${deleteName}%'
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME LIKE '%${deleteTime}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from AMSSHIP_CARGO_TRANSFER_RESULT
+        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMSSHIP_CARGO_TRANSFER_RESULT
+        where 1!=1
+        <if test="resultNumber != null and resultNumber != ''">
+            or RESULT_NUMBER = #{resultNumber}
+        </if>
+        <if test="carrierId != null">
+            or CARRIER_ID = #{carrierId}
+        </if>
+        <if test="resultContactPerson != null and resultContactPerson != ''">
+            or RESULT_CONTACT_PERSON = #{resultContactPerson}
+        </if>
+        <if test="resultTelephoneFax != null and resultTelephoneFax != ''">
+            or RESULT_TELEPHONE_FAX = #{resultTelephoneFax}
+        </if>
+        <if test="groupId != null">
+            or GROUP_ID = #{groupId}
+        </if>
+        <if test="batchId != null">
+            or BATCH_ID = #{batchId}
+        </if>
+        <if test="resultNumberOfLoans != null">
+            or RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans}
+        </if>
+        <if test="resultFreightForwardingInfo != null and resultFreightForwardingInfo != ''">
+            or RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo}
+        </if>
+        <if test="resultMemo != null and resultMemo != ''">
+            or RESULT_MEMO = #{resultMemo}
+        </if>
+        <if test="deleteName != null and deleteName != ''">
+            or DELETE_NAME = #{deleteName}
+        </if>
+        <if test="deleteTime != null and deleteTime != ''">
+            or DELETE_TIME = #{deleteTime}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
+        insert into AMSSHIP_CARGO_TRANSFER_RESULT (CARGO_TRANSFER_RESULT_ID, RESULT_NUMBER,
+                                                   CARRIER_ID, RESULT_CONTACT_PERSON, RESULT_TELEPHONE_FAX,
+                                                   GROUP_ID, BATCH_ID, RESULT_NUMBER_OF_LOANS,
+                                                   RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO,
+                                                   DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+                                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                                   INSERT_UPDATE_REMARK, DELETED)
+        values (#{cargoTransferResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR},
+                #{carrierId,jdbcType=DECIMAL}, #{resultContactPerson,jdbcType=VARCHAR},
+                #{resultTelephoneFax,jdbcType=VARCHAR},
+                #{groupId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{resultNumberOfLoans,jdbcType=DECIMAL},
+                #{resultFreightForwardingInfo,jdbcType=VARCHAR}, #{resultMemo,jdbcType=VARCHAR},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
+        insert into AMSSHIP_CARGO_TRANSFER_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cargoTransferResultId != null">
+                CARGO_TRANSFER_RESULT_ID,
+            </if>
+            <if test="resultNumber != null">
+                RESULT_NUMBER,
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID,
+            </if>
+            <if test="resultContactPerson != null">
+                RESULT_CONTACT_PERSON,
+            </if>
+            <if test="resultTelephoneFax != null">
+                RESULT_TELEPHONE_FAX,
+            </if>
+            <if test="groupId != null">
+                GROUP_ID,
+            </if>
+            <if test="batchId != null">
+                BATCH_ID,
+            </if>
+            <if test="resultNumberOfLoans != null">
+                RESULT_NUMBER_OF_LOANS,
+            </if>
+            <if test="resultFreightForwardingInfo != null">
+                RESULT_FREIGHT_FORWARDING_INFO,
+            </if>
+            <if test="resultMemo != null">
+                RESULT_MEMO,
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME,
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cargoTransferResultId != null">
+                #{cargoTransferResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultNumber != null">
+                #{resultNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="carrierId != null">
+                #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultContactPerson != null">
+                #{resultContactPerson,jdbcType=VARCHAR},
+            </if>
+            <if test="resultTelephoneFax != null">
+                #{resultTelephoneFax,jdbcType=VARCHAR},
+            </if>
+            <if test="groupId != null">
+                #{groupId,jdbcType=DECIMAL},
+            </if>
+            <if test="batchId != null">
+                #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultNumberOfLoans != null">
+                #{resultNumberOfLoans,jdbcType=DECIMAL},
+            </if>
+            <if test="resultFreightForwardingInfo != null">
+                #{resultFreightForwardingInfo,jdbcType=VARCHAR},
+            </if>
+            <if test="resultMemo != null">
+                #{resultMemo,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
+        update AMSSHIP_CARGO_TRANSFER_RESULT
+        set RESULT_NUMBER                  = #{resultNumber,jdbcType=VARCHAR},
+            CARRIER_ID                     = #{carrierId,jdbcType=DECIMAL},
+            RESULT_CONTACT_PERSON          = #{resultContactPerson,jdbcType=VARCHAR},
+            RESULT_TELEPHONE_FAX           = #{resultTelephoneFax,jdbcType=VARCHAR},
+            GROUP_ID                       = #{groupId,jdbcType=DECIMAL},
+            BATCH_ID                       = #{batchId,jdbcType=DECIMAL},
+            RESULT_NUMBER_OF_LOANS         = #{resultNumberOfLoans,jdbcType=DECIMAL},
+            RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
+            RESULT_MEMO                    = #{resultMemo,jdbcType=VARCHAR},
+            DELETE_NAME                    = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME                    = #{deleteTime,jdbcType=VARCHAR},
+            INSERT_USERNAME                = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                    = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME                = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                    = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK           = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED                        = #{deleted,jdbcType=DECIMAL}
+        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipCargoTransferResult">
+        update AMSSHIP_CARGO_TRANSFER_RESULT
+        <set>
+            <if test="resultNumber != null">
+                RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultContactPerson != null">
+                RESULT_CONTACT_PERSON = #{resultContactPerson,jdbcType=VARCHAR},
+            </if>
+            <if test="resultTelephoneFax != null">
+                RESULT_TELEPHONE_FAX = #{resultTelephoneFax,jdbcType=VARCHAR},
+            </if>
+            <if test="groupId != null">
+                GROUP_ID = #{groupId,jdbcType=DECIMAL},
+            </if>
+            <if test="batchId != null">
+                BATCH_ID = #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultNumberOfLoans != null">
+                RESULT_NUMBER_OF_LOANS = #{resultNumberOfLoans,jdbcType=DECIMAL},
+            </if>
+            <if test="resultFreightForwardingInfo != null">
+                RESULT_FREIGHT_FORWARDING_INFO = #{resultFreightForwardingInfo,jdbcType=VARCHAR},
+            </if>
+            <if test="resultMemo != null">
+                RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into AMSSHIP_CARGO_TRANSFER_RESULT
+        (CARGO_TRANSFER_RESULT_ID,
+        RESULT_NUMBER, CARRIER_ID, RESULT_CONTACT_PERSON,
+        RESULT_TELEPHONE_FAX, GROUP_ID,
+        BATCH_ID, RESULT_NUMBER_OF_LOANS,
+        RESULT_FREIGHT_FORWARDING_INFO, RESULT_MEMO,
+        DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.cargoTransferResultId,jdbcType=DECIMAL},
+        #{item.resultNumber,jdbcType=VARCHAR}, #{item.carrierId,jdbcType=DECIMAL},
+        #{item.resultContactPerson,jdbcType=VARCHAR},
+        #{item.resultTelephoneFax,jdbcType=VARCHAR}, #{item.groupId,jdbcType=DECIMAL},
+        #{item.batchId,jdbcType=DECIMAL}, #{item.resultNumberOfLoans,jdbcType=DECIMAL},
+        #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}, #{item.resultMemo,jdbcType=VARCHAR},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR},
+        #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update AMSSHIP_CARGO_TRANSFER_RESULT
+        set
+        CARGO_TRANSFER_RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.cargoTransferResultId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,CARRIER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_CONTACT_PERSON=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultContactPerson,jdbcType=VARCHAR}
+        </foreach>
+        ,RESULT_TELEPHONE_FAX=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultTelephoneFax,jdbcType=VARCHAR}
+        </foreach>
+        ,GROUP_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.groupId,jdbcType=DECIMAL}
+        </foreach>
+        ,BATCH_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_NUMBER_OF_LOANS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultNumberOfLoans,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_FREIGHT_FORWARDING_INFO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then
+            #{item.resultFreightForwardingInfo,jdbcType=VARCHAR}
+        </foreach>
+        ,RESULT_MEMO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case CARGO_TRANSFER_RESULT_ID"
+                 close="end">
+            when #{item.cargoTransferResultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where CARGO_TRANSFER_RESULT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.cargoTransferResultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMSSHIP_CARGO_TRANSFER_RESULT
+        where CARGO_TRANSFER_RESULT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="seletCargoTransfer" resultType="java.util.Map">
+        select *
+        from
+        (select
+        t1.RESULT_NUMBER "resultNumber",
+        t4.CARRIER_NAME "carrierName",
+        t1.RESULT_CONTACT_PERSON "resultContactPerson",
+        t1.RESULT_TELEPHONE_FAX "ResultTelephoneFax",
+        t2.PIER_NAME "pierName",
+        t6.MATERIAL_NAME "materialName",
+        t5.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        t5.BATCH_ID "batchId",
+        t1.RESULT_NUMBER_OF_LOANS "resultNumberOf",
+        t1.RESULT_FREIGHT_FORWARDING_INFO "resultInfo",
+        t1.CARGO_TRANSFER_RESULT_ID "cargoTransferResultId",
+        t1.RESULT_MEMO "resultMemo"
+
+
+        from AMSSHIP_CARGO_TRANSFER_RESULT t1
+        left join RMS_PIER t2
+        on t1.GROUP_ID=t2.PIER_ID
+        left join AMSSHIP_DELIVERY_NOTICE t3
+        on t1.BATCH_ID=t3.BATCH_ID
+        left join APPOINT_CARRIER t4
+        on t1.CARRIER_ID=t4.CARRIER_ID
+        left join DIL_BATCH t5
+        on t1.BATCH_ID=t5.BATCH_ID
+        left join RMS_MATERIAL t6
+        on t5.MATERIAL_ID=t6.MATERIAL_ID
+        where t1.deleted = 0
+        )
+        <where>
+            <if test="resultNumber!= null">
+                and t1.RESULT_NUMBER in
+                <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultContactPerson!= null">
+                and t1.RESULT_CONTACT_PERSON in
+                <foreach collection="resultContactPerson" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="ResultTelephoneFax!= null">
+                and t1.RESULT_TELEPHONE_FAX in
+                <foreach collection="ResultTelephoneFax" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultMemo!= null">
+                and t1.RESULT_MEMO in
+                <foreach collection="resultMemo" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="resultNumberOf!= null">
+                and t1.RESULT_NUMBER_OF_LOANS in
+                <foreach collection="resultNumberOf" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="pierName!= null">
+                and t2.PIER_NAME in
+                <foreach collection="pierName" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="materialCapacityName!= null">
+                and t3.MATERIAL_CAPACITY_NAME in
+                <foreach collection="materialCapacityName" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="carrierName!= null">
+                and t4.CARRIER_NAME in
+                <foreach collection="carrierName" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="materialName!= null">
+                and t5.MATERIAL_NAME in
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+    <!--  自动生成Id-->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(CARGO_TRANSFER_RESULT_ID) + 1
+        FROM AMSSHIP_CARGO_TRANSFER_RESULT
+    </select>
+    <!-- 下拉框绑定Id-->
+    <!--  下拉框中获取货权转移单位 -->
+    <select id="getShipper" resultType="java.util.LinkedHashMap">
+        select RS.SHIPPER_ID   "id",
+               RS.SHIPPER_ID   "value",
+               RS.SHIPPER_NAME "label"
+        from RMS_SHIPPER RS
+    </select>
+    <!--  下拉框中获取收货人单位 -->
+    <select id="getGroup" resultType="java.util.LinkedHashMap">
+        select RP.PIER_ID   "id",
+               RP.PIER_ID   "value",
+               RP.PIER_NAME "label"
+        from RMS_PIER RP
+    </select>
+    <!--  下拉框中获取物资名称 -->
+    <select id="getCargoId" resultType="java.util.LinkedHashMap">
+        select RM.MATERIAL_ID   "id",
+               RM.MATERIAL_ID   "value",
+               RM.MATERIAL_NAME "label"
+        from RMS_MATERIAL RM
+    </select>
+    <select id="insertBetchId" resultType="java.util.LinkedHashMap">
+        select
+            BATCH_ID "id",
+            BATCH_ID "value",
+            CONCAT(CONCAT(RM.MATERIAL_NAME, '"'), CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"')) "label"
+        from DIL_BATCH DB
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = DB.MATERIAL_ID
+    </select>
+    <!--  根据id查询所需更改的所有数据-->
+    <select id="selectByOrder" resultType="java.util.Map">
+        select t1.CARRIER_ID                     "carrierId",
+               t1.RESULT_TELEPHONE_FAX           "resultTelephoneFax",
+               t1.RESULT_CONTACT_PERSON          "resultContactPerson",
+               t1.RESULT_NUMBER_OF_LOANS         "resultNumberOfLoans",
+               t1.RESULT_FREIGHT_FORWARDING_INFO "resultFreignForwardingInfo",
+               t1.RESULT_MEMO                    "resultMemo",
+               t1.GROUP_ID                       "groupId",
+               t1.BATCH_ID                       "batchId"
+        from AMSSHIP_CARGO_TRANSFER_RESULT t1
+        where t1.CARGO_TRANSFER_RESULT_ID = #{cargoTransferResultId}
+    </select>
+
+    <select id="selectPortId" resultType="DECIMAL" parameterType="DECIMAL">
+        SELECT PORT_ID
+        FROM RMS_PIER
+        WHERE PIER_ID = #{pierId}
+    </select>
+
+</mapper>

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

@@ -0,0 +1,690 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsshipDeliveryAttorneyMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
+    <id column="ATTORNEY_ID" jdbcType="DECIMAL" property="attorneyId" />
+    <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
+    <result column="PORT_ID" jdbcType="DECIMAL" property="portId" />
+    <result column="DOWN_SWIM_PORT_ID" jdbcType="DECIMAL" property="downSwimPortId" />
+    <result column="ATTORNEY_PICKUP_CONTACT_PERSON" jdbcType="VARCHAR" property="attorneyPickupContactPerson" />
+    <result column="ATTORENY_PICKUP_IDCARD" jdbcType="VARCHAR" property="attorenyPickupIdcard" />
+    <result column="ATTORNEY_CONTACT_TELEPHONE" jdbcType="VARCHAR" property="attorneyContactTelephone" />
+    <result column="ATTORNEY_TIME" jdbcType="TIMESTAMP" property="attorneyTime" />
+    <result column="ATTORNEY_PDFFILE" jdbcType="VARCHAR" property="attorneyPdffile" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="ATTORNEY_DISTRIBUTION_STATUS" jdbcType="VARCHAR" property="attorneyDistributionStatus" />
+  </resultMap>
+  <sql id="columns">
+    ATTORNEY_ID, BATCH_ID, PORT_ID, DOWN_SWIM_PORT_ID, ATTORNEY_PICKUP_CONTACT_PERSON,
+    ATTORENY_PICKUP_IDCARD, ATTORNEY_CONTACT_TELEPHONE, ATTORNEY_TIME, ATTORNEY_PDFFILE,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED, ATTORNEY_DISTRIBUTION_STATUS
+  </sql>
+  <sql id="columns_alias">
+    t.ATTORNEY_ID, t.BATCH_ID, t.PORT_ID, t.DOWN_SWIM_PORT_ID, t.ATTORNEY_PICKUP_CONTACT_PERSON,
+    t.ATTORENY_PICKUP_IDCARD, t.ATTORNEY_CONTACT_TELEPHONE, t.ATTORNEY_TIME, t.ATTORNEY_PDFFILE,
+    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.ATTORNEY_DISTRIBUTION_STATUS
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM AMSSHIP_DELIVERY_ATTORNEY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM AMSSHIP_DELIVERY_ATTORNEY t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="attorneyId != null">
+        and ATTORNEY_ID = #{attorneyId}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="portId != null">
+        and PORT_ID = #{portId}
+      </if>
+      <if test="downSwimPortId != null">
+        and DOWN_SWIM_PORT_ID = #{downSwimPortId}
+      </if>
+      <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
+        and ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson}
+      </if>
+      <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
+        and ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard}
+      </if>
+      <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
+        and ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone}
+      </if>
+      <if test="attorneyTime != null">
+        and TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = #{attorneyTime}
+      </if>
+      <if test="attorneyPdffile != null and attorneyPdffile != ''">
+        and ATTORNEY_PDFFILE = #{attorneyPdffile}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="attorneyDistributionStatus != null and attorneyDistributionStatus != ''">
+        and ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="attorneyId != null">
+        and ATTORNEY_ID = #{attorneyId}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="portId != null">
+        and PORT_ID = #{portId}
+      </if>
+      <if test="downSwimPortId != null">
+        and DOWN_SWIM_PORT_ID = #{downSwimPortId}
+      </if>
+      <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
+        and ATTORNEY_PICKUP_CONTACT_PERSON LIKE '%${attorneyPickupContactPerson}%'
+      </if>
+      <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
+        and ATTORENY_PICKUP_IDCARD LIKE '%${attorenyPickupIdcard}%'
+      </if>
+      <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
+        and ATTORNEY_CONTACT_TELEPHONE LIKE '%${attorneyContactTelephone}%'
+      </if>
+      <if test="attorneyTime != null">
+        and TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = #{attorneyTime}
+      </if>
+      <if test="attorneyPdffile != null and attorneyPdffile != ''">
+        and ATTORNEY_PDFFILE LIKE '%${attorneyPdffile}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="attorneyDistributionStatus != null and attorneyDistributionStatus != ''">
+        and ATTORNEY_DISTRIBUTION_STATUS LIKE '%${attorneyDistributionStatus}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMSSHIP_DELIVERY_ATTORNEY
+    where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMSSHIP_DELIVERY_ATTORNEY
+    where 1!=1
+    <if test="batchId != null">
+      or BATCH_ID = #{batchId}
+    </if>
+    <if test="portId != null">
+      or PORT_ID = #{portId}
+    </if>
+    <if test="downSwimPortId != null">
+      or DOWN_SWIM_PORT_ID = #{downSwimPortId}
+    </if>
+    <if test="attorneyPickupContactPerson != null and attorneyPickupContactPerson != ''">
+      or ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson}
+    </if>
+    <if test="attorenyPickupIdcard != null and attorenyPickupIdcard != ''">
+      or ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard}
+    </if>
+    <if test="attorneyContactTelephone != null and attorneyContactTelephone != ''">
+      or ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone}
+    </if>
+    <if test="attorneyTime != null">
+      or TO_CHAR(ATTORNEY_TIME,'yyyy-MM-dd') = '#{attorneyTime}'
+    </if>
+    <if test="attorneyPdffile != null and attorneyPdffile != ''">
+      or ATTORNEY_PDFFILE = #{attorneyPdffile}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="attorneyDistributionStatus != null and attorneyDistributionStatus != ''">
+      or ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
+    insert into AMSSHIP_DELIVERY_ATTORNEY (ATTORNEY_ID, BATCH_ID, PORT_ID,
+                                           DOWN_SWIM_PORT_ID, ATTORNEY_PICKUP_CONTACT_PERSON,
+                                           ATTORENY_PICKUP_IDCARD, ATTORNEY_CONTACT_TELEPHONE,
+                                           ATTORNEY_TIME, ATTORNEY_PDFFILE, DELETE_NAME,
+                                           DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
+                                           UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                           DELETED, ATTORNEY_DISTRIBUTION_STATUS)
+    values (#{attorneyId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{portId,jdbcType=DECIMAL},
+            #{downSwimPortId,jdbcType=DECIMAL}, #{attorneyPickupContactPerson,jdbcType=VARCHAR},
+            #{attorenyPickupIdcard,jdbcType=VARCHAR}, #{attorneyContactTelephone,jdbcType=VARCHAR},
+            #{attorneyTime,jdbcType=TIMESTAMP}, #{attorneyPdffile,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR},
+            #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+            #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+            #{deleted,jdbcType=DECIMAL}, #{attorneyDistributionStatus,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
+    insert into AMSSHIP_DELIVERY_ATTORNEY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="attorneyId != null">
+        ATTORNEY_ID,
+      </if>
+      <if test="batchId != null">
+        BATCH_ID,
+      </if>
+      <if test="portId != null">
+        PORT_ID,
+      </if>
+      <if test="downSwimPortId != null">
+        DOWN_SWIM_PORT_ID,
+      </if>
+      <if test="attorneyPickupContactPerson != null">
+        ATTORNEY_PICKUP_CONTACT_PERSON,
+      </if>
+      <if test="attorenyPickupIdcard != null">
+        ATTORENY_PICKUP_IDCARD,
+      </if>
+      <if test="attorneyContactTelephone != null">
+        ATTORNEY_CONTACT_TELEPHONE,
+      </if>
+      <if test="attorneyTime != null">
+        ATTORNEY_TIME,
+      </if>
+      <if test="attorneyPdffile != null">
+        ATTORNEY_PDFFILE,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="attorneyDistributionStatus != null">
+        ATTORNEY_DISTRIBUTION_STATUS,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="attorneyId != null">
+        #{attorneyId,jdbcType=DECIMAL},
+      </if>
+      <if test="batchId != null">
+        #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="portId != null">
+        #{portId,jdbcType=DECIMAL},
+      </if>
+      <if test="downSwimPortId != null">
+        #{downSwimPortId,jdbcType=DECIMAL},
+      </if>
+      <if test="attorneyPickupContactPerson != null">
+        #{attorneyPickupContactPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="attorenyPickupIdcard != null">
+        #{attorenyPickupIdcard,jdbcType=VARCHAR},
+      </if>
+      <if test="attorneyContactTelephone != null">
+        #{attorneyContactTelephone,jdbcType=VARCHAR},
+      </if>
+      <if test="attorneyTime != null">
+        #{attorneyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="attorneyPdffile != null">
+        #{attorneyPdffile,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="attorneyDistributionStatus != null">
+        #{attorneyDistributionStatus,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
+    update AMSSHIP_DELIVERY_ATTORNEY
+    set BATCH_ID = #{batchId,jdbcType=DECIMAL},
+        PORT_ID = #{portId,jdbcType=DECIMAL},
+        DOWN_SWIM_PORT_ID = #{downSwimPortId,jdbcType=DECIMAL},
+        ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson,jdbcType=VARCHAR},
+        ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard,jdbcType=VARCHAR},
+        ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone,jdbcType=VARCHAR},
+        ATTORNEY_TIME = #{attorneyTime,jdbcType=TIMESTAMP},
+        ATTORNEY_PDFFILE = #{attorneyPdffile,jdbcType=VARCHAR},
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus,jdbcType=VARCHAR}
+    where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryAttorney">
+    update AMSSHIP_DELIVERY_ATTORNEY
+    <set>
+      <if test="batchId != null">
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="portId != null">
+        PORT_ID = #{portId,jdbcType=DECIMAL},
+      </if>
+      <if test="downSwimPortId != null">
+        DOWN_SWIM_PORT_ID = #{downSwimPortId,jdbcType=DECIMAL},
+      </if>
+      <if test="attorneyPickupContactPerson != null">
+        ATTORNEY_PICKUP_CONTACT_PERSON = #{attorneyPickupContactPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="attorenyPickupIdcard != null">
+        ATTORENY_PICKUP_IDCARD = #{attorenyPickupIdcard,jdbcType=VARCHAR},
+      </if>
+      <if test="attorneyContactTelephone != null">
+        ATTORNEY_CONTACT_TELEPHONE = #{attorneyContactTelephone,jdbcType=VARCHAR},
+      </if>
+      <if test="attorneyTime != null">
+        ATTORNEY_TIME = #{attorneyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="attorneyPdffile != null">
+        ATTORNEY_PDFFILE = #{attorneyPdffile,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="attorneyDistributionStatus != null">
+        ATTORNEY_DISTRIBUTION_STATUS = #{attorneyDistributionStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where ATTORNEY_ID = #{attorneyId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMSSHIP_DELIVERY_ATTORNEY
+    (ATTORNEY_ID,
+    BATCH_ID, PORT_ID, DOWN_SWIM_PORT_ID,
+    ATTORNEY_PICKUP_CONTACT_PERSON, ATTORENY_PICKUP_IDCARD,
+    ATTORNEY_CONTACT_TELEPHONE, ATTORNEY_TIME,
+    ATTORNEY_PDFFILE, DELETE_NAME,
+    DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    ATTORNEY_DISTRIBUTION_STATUS)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.attorneyId,jdbcType=DECIMAL},
+    #{item.batchId,jdbcType=DECIMAL}, #{item.portId,jdbcType=DECIMAL}, #{item.downSwimPortId,jdbcType=DECIMAL},
+    #{item.attorneyPickupContactPerson,jdbcType=VARCHAR}, #{item.attorenyPickupIdcard,jdbcType=VARCHAR},
+    #{item.attorneyContactTelephone,jdbcType=VARCHAR}, #{item.attorneyTime,jdbcType=TIMESTAMP},
+    #{item.attorneyPdffile,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
+    #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.attorneyDistributionStatus,jdbcType=VARCHAR} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update AMSSHIP_DELIVERY_ATTORNEY
+    set
+    ATTORNEY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyId,jdbcType=DECIMAL}
+    </foreach>
+    ,BATCH_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+    </foreach>
+    ,PORT_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
+    </foreach>
+    ,DOWN_SWIM_PORT_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.downSwimPortId,jdbcType=DECIMAL}
+    </foreach>
+    ,ATTORNEY_PICKUP_CONTACT_PERSON=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyPickupContactPerson,jdbcType=VARCHAR}
+    </foreach>
+    ,ATTORENY_PICKUP_IDCARD=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorenyPickupIdcard,jdbcType=VARCHAR}
+    </foreach>
+    ,ATTORNEY_CONTACT_TELEPHONE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyContactTelephone,jdbcType=VARCHAR}
+    </foreach>
+    ,ATTORNEY_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,ATTORNEY_PDFFILE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyPdffile,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,ATTORNEY_DISTRIBUTION_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case ATTORNEY_ID" close="end">
+      when #{item.attorneyId,jdbcType=DECIMAL} then #{item.attorneyDistributionStatus,jdbcType=VARCHAR}
+    </foreach>
+    where ATTORNEY_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.attorneyId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMSSHIP_DELIVERY_ATTORNEY
+    where ATTORNEY_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectshipCargoTranferResult" resultType="java.util.Map">
+    select *
+    from(select
+    t3.SHIPPER_NAME  "shipperName",
+    t4.CARRIER_NAME  "carrierName",
+    t6.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+    t8.MATERIAL_NAME "materialName",
+    t5.PORT_NAME "portName",
+    t5.PORT_NAME "portName1",
+    t1.ATTORNEY_PICKUP_CONTACT_PERSON "attorneyPickupContactPerson",
+    t1.ATTORENY_PICKUP_IDCARD  "attorneyPickupIdcard",
+    t1.ATTORNEY_CONTACT_TELEPHONE "attorneyContactTelephone",
+    t1.ATTORNEY_TIME "attorneyTime",
+    t7.PUCHASE_ORDER_MATERIAL_NUMBER "purchaseOrderMaterialNumber",
+    t2.CARRIER_ID "carrierId",
+    t2.REQUESTER_GROUP_ID "groupId",
+    t1.ATTORNEY_ID "attorneyId",
+    t1.BATCH_ID "batchId"
+    from   AMSSHIP_DELIVERY_ATTORNEY t1
+    left join  AMSSHIP_DELIVERY_NOTICE t2
+    on  t1.BATCH_ID=t2.BATCH_ID
+    left join RMS_SHIPPER t3
+    on t2.REQUESTER_GROUP_ID=t3.SHIPPER_ID
+    left join APPOINT_CARRIER t4
+    on t2.CARRIER_ID=t4.CARRIER_ID
+    left join  RMS_PORT t5
+    on t1.PORT_ID=t5.PORT_ID
+    left join  DIL_BATCH t6
+    on t1.BATCH_ID=t6.BATCH_ID
+    left join AMS_PURCHASE_ORDER t7
+    on t6.BATCH_ID=t7.BATCH_ID
+    left join  RMS_MATERIAL t8
+    on t6.MATERIAL_ID=t8.MATERIAL_ID
+    where  t1.deleted = 0
+    )
+    <where>
+      <if test="shipperName!= null">
+        and  t3.SHIPPER_NAME in
+        <foreach collection="shipperName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="carrierName!= null">
+        and  t4.CARRIER_NAME in
+        <foreach collection="carrierName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="materialName!= null">
+        and   t8.MATERIAL_NAME  in
+        <foreach collection="materialName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="portName!= null">
+        and   t5.PORT_NAME  in
+        <foreach collection="portName" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="portName1!= null">
+        and   t5.PORT_NAME  in
+        <foreach collection="portName1" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+  </select>
+  <!--  自动生成Id-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(ATTORNEY_ID)+1 FROM AMSSHIP_DELIVERY_ATTORNEY
+  </select>
+  <!--  下拉框中获取收货人单位 -->
+  <select id="getPortName" resultType="java.util.LinkedHashMap">
+    select
+      RP.PORT_ID "id",
+      RP.PORT_ID "value",
+      RP.PORT_NAME "label"
+    from
+      RMS_PORT   RP
+  </select>
+  <!--  下拉框中获取放货通知单id-->
+  <select id="getNoticeId" resultType="java.util.LinkedHashMap">
+    select
+      ADN.NOTICE_ID "id",
+      ADN.NOTICE_ID "value",
+      ADN.NOTICE_ID "label"
+    from
+      AMSSHIP_DELIVERY_NOTICE   ADN
+  </select>
+  <!--  根据主键id进行查询-->
+  <select id="getDeliveryAttorneyId" resultType="java.util.Map">
+    select t1.BATCH_ID "batchId",
+           t1.PORT_ID  "portId",
+           t1.DOWN_SWIM_PORT_ID "downSwimPortId",
+           t1.ATTORNEY_PICKUP_CONTACT_PERSON  "attorneyPickupContactPerson",
+           t1.ATTORENY_PICKUP_IDCARD  "attorneyPickupIdcard",
+           t1.ATTORNEY_CONTACT_TELEPHONE  "attorneyContactTelephone",
+           t1.ATTORNEY_TIME "attorneytime",
+           t1.ATTORNEY_PDFFILE "attorneyPdffile"
+
+    from AMSSHIP_DELIVERY_ATTORNEY t1
+    where  t1.ATTORNEY_ID=#{attorneyId}
+  </select>
+  <!--得到提货通知单id-->
+  <select id="getAttorneyId" resultType="java.util.LinkedHashMap">
+    SELECT
+    ada.ATTORNEY_ID "id",
+    ada.ATTORNEY_ID "value",
+    ada.ATTORNEY_PICKUP_CONTACT_PERSON "label"
+    FROM AMSSHIP_DELIVERY_ATTORNEY ada
+  </select>
+
+  <!--得到发件人id（港口）-->
+  <select id="getPortId" resultType="java.util.LinkedHashMap" >
+    SELECT
+    rp.PORT_ID "id",
+    rp.PORT_ID "value",
+    rp.PORT_NAME "label"
+    FROM RMS_PORT rp
+  </select>
+
+  <!--得到收件人id（下游码头）-->
+  <select id="getPierId" resultType="java.util.LinkedHashMap" >
+    SELECT
+    rp.PIER_ID "id",
+    rp.PIER_ID "value",
+    rp.PIER_NAME "label"
+    FROM RMS_PIER rp
+  </select>
+
+  <select id="getRmRawId" resultType="java.util.LinkedHashMap">
+    SELECT
+    rrmr.GM_ID "id",
+    rrmr.GM_ID "value",
+    rrmr.GM_TONNAGE "label"
+    FROM WMSH_GRID_MATERIAL rrmr
+  </select>
+
+</mapper>

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

@@ -0,0 +1,841 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsshipDeliveryNoticeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsshipDeliveryNotice">
+    <id column="NOTICE_ID" jdbcType="DECIMAL" property="noticeId" />
+    <result column="REQUESTER_GROUP_ID" jdbcType="DECIMAL" property="requesterGroupId" />
+    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+    <result column="NOTICE_COMMERCE_METHOD" jdbcType="VARCHAR" property="noticeCommerceMethod" />
+    <result column="NOTICE_HANDOVER_METHOD" jdbcType="VARCHAR" property="noticeHandoverMethod" />
+    <result column="PORT_ID" jdbcType="DECIMAL" property="portId" />
+    <result column="NOTICE_PORT_CONSTRUCTION_FEE" jdbcType="DECIMAL" property="noticePortConstructionFee" />
+    <result column="NOTICE_DELIVERY_TIME" jdbcType="TIMESTAMP" property="noticeDeliveryTime" />
+    <result column="NOTICE_PILE_FREE_DAYS" jdbcType="DECIMAL" property="noticePileFreeDays" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="NOTICE_DISTRIBUTION_STATUS" jdbcType="VARCHAR" property="noticeDistributionStatus" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
+    <result column="PURCHASE_CONTRACT_UNIT_PRICE" jdbcType="DECIMAL" property="purchaseContractUnitPrice" />
+    <result column="PURCHASE_CONTRACT_MOISTURE" jdbcType="VARCHAR" property="purchaseContractMoisture" />
+    <result column="PURCHASE_CONTRACT_QUALITYINDEX" jdbcType="VARCHAR" property="purchaseContractQualityindex" />
+  </resultMap>
+  <sql id="columns">
+    NOTICE_ID, REQUESTER_GROUP_ID, CARRIER_ID, NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
+    PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS, DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
+    PURCHASE_CONTRACT_MOISTURE, PURCHASE_CONTRACT_QUALITYINDEX
+  </sql>
+  <sql id="columns_alias">
+    t.NOTICE_ID, t.REQUESTER_GROUP_ID, t.CARRIER_ID, t.NOTICE_COMMERCE_METHOD, t.NOTICE_HANDOVER_METHOD,
+    t.PORT_ID, t.NOTICE_PORT_CONSTRUCTION_FEE, t.NOTICE_DELIVERY_TIME, t.NOTICE_PILE_FREE_DAYS,
+    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.NOTICE_DISTRIBUTION_STATUS, t.DELETED, t.BATCH_ID,
+    t.PURCHASE_CONTRACT_UNIT_PRICE, t.PURCHASE_CONTRACT_MOISTURE, t.PURCHASE_CONTRACT_QUALITYINDEX
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM AMSSHIP_DELIVERY_NOTICE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM AMSSHIP_DELIVERY_NOTICE t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="noticeId != null">
+        and NOTICE_ID = #{noticeId}
+      </if>
+      <if test="requesterGroupId != null">
+        and REQUESTER_GROUP_ID = #{requesterGroupId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
+        and NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
+      </if>
+      <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
+        and NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
+      </if>
+      <if test="portId != null">
+        and PORT_ID = #{portId}
+      </if>
+      <if test="noticePortConstructionFee != null">
+        and NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
+      </if>
+      <if test="noticeDeliveryTime != null">
+        and TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = #{noticeDeliveryTime}
+      </if>
+      <if test="noticePileFreeDays != null">
+        and NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="noticeDistributionStatus != null and noticeDistributionStatus != ''">
+        and NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="purchaseContractUnitPrice != null">
+        and PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
+      </if>
+      <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
+        and PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
+      </if>
+      <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
+        and PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="noticeId != null">
+        and NOTICE_ID = #{noticeId}
+      </if>
+      <if test="requesterGroupId != null">
+        and REQUESTER_GROUP_ID = #{requesterGroupId}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+      <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
+        and NOTICE_COMMERCE_METHOD LIKE '%${noticeCommerceMethod}%'
+      </if>
+      <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
+        and NOTICE_HANDOVER_METHOD LIKE '%${noticeHandoverMethod}%'
+      </if>
+      <if test="portId != null">
+        and PORT_ID = #{portId}
+      </if>
+      <if test="noticePortConstructionFee != null">
+        and NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
+      </if>
+      <if test="noticeDeliveryTime != null">
+        and TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = #{noticeDeliveryTime}
+      </if>
+      <if test="noticePileFreeDays != null">
+        and NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="noticeDistributionStatus != null and noticeDistributionStatus != ''">
+        and NOTICE_DISTRIBUTION_STATUS LIKE '%${noticeDistributionStatus}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="purchaseContractUnitPrice != null">
+        and PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
+      </if>
+      <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
+        and PURCHASE_CONTRACT_MOISTURE LIKE '%${purchaseContractMoisture}%'
+      </if>
+      <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
+        and PURCHASE_CONTRACT_QUALITYINDEX LIKE '%${purchaseContractQualityindex}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from AMSSHIP_DELIVERY_NOTICE
+    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMSSHIP_DELIVERY_NOTICE
+    where 1!=1
+    <if test="requesterGroupId != null">
+      or REQUESTER_GROUP_ID = #{requesterGroupId}
+    </if>
+    <if test="carrierId != null">
+      or CARRIER_ID = #{carrierId}
+    </if>
+    <if test="noticeCommerceMethod != null and noticeCommerceMethod != ''">
+      or NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod}
+    </if>
+    <if test="noticeHandoverMethod != null and noticeHandoverMethod != ''">
+      or NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod}
+    </if>
+    <if test="portId != null">
+      or PORT_ID = #{portId}
+    </if>
+    <if test="noticePortConstructionFee != null">
+      or NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee}
+    </if>
+    <if test="noticeDeliveryTime != null">
+      or TO_CHAR(NOTICE_DELIVERY_TIME,'yyyy-MM-dd') = '#{noticeDeliveryTime}'
+    </if>
+    <if test="noticePileFreeDays != null">
+      or NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="noticeDistributionStatus != null and noticeDistributionStatus != ''">
+      or NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="batchId != null">
+      or BATCH_ID = #{batchId}
+    </if>
+    <if test="purchaseContractUnitPrice != null">
+      or PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice}
+    </if>
+    <if test="purchaseContractMoisture != null and purchaseContractMoisture != ''">
+      or PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture}
+    </if>
+    <if test="purchaseContractQualityindex != null and purchaseContractQualityindex != ''">
+      or PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
+    insert into AMSSHIP_DELIVERY_NOTICE (NOTICE_ID, REQUESTER_GROUP_ID, CARRIER_ID,
+                                         NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
+                                         PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE, NOTICE_DELIVERY_TIME,
+                                         NOTICE_PILE_FREE_DAYS, DELETE_NAME, DELETE_TIME,
+                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, NOTICE_DISTRIBUTION_STATUS,
+                                         DELETED, BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
+                                         PURCHASE_CONTRACT_MOISTURE, PURCHASE_CONTRACT_QUALITYINDEX
+    )
+    values (#{noticeId,jdbcType=DECIMAL}, #{requesterGroupId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+            #{noticeCommerceMethod,jdbcType=VARCHAR}, #{noticeHandoverMethod,jdbcType=VARCHAR},
+            #{portId,jdbcType=DECIMAL}, #{noticePortConstructionFee,jdbcType=DECIMAL}, #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+            #{noticePileFreeDays,jdbcType=DECIMAL}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
+            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{noticeDistributionStatus,jdbcType=VARCHAR},
+            #{deleted,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+            #{purchaseContractMoisture,jdbcType=VARCHAR}, #{purchaseContractQualityindex,jdbcType=VARCHAR}
+           )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
+    insert into AMSSHIP_DELIVERY_NOTICE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="noticeId != null">
+        NOTICE_ID,
+      </if>
+      <if test="requesterGroupId != null">
+        REQUESTER_GROUP_ID,
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+      <if test="noticeCommerceMethod != null">
+        NOTICE_COMMERCE_METHOD,
+      </if>
+      <if test="noticeHandoverMethod != null">
+        NOTICE_HANDOVER_METHOD,
+      </if>
+      <if test="portId != null">
+        PORT_ID,
+      </if>
+      <if test="noticePortConstructionFee != null">
+        NOTICE_PORT_CONSTRUCTION_FEE,
+      </if>
+      <if test="noticeDeliveryTime != null">
+        NOTICE_DELIVERY_TIME,
+      </if>
+      <if test="noticePileFreeDays != null">
+        NOTICE_PILE_FREE_DAYS,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="noticeDistributionStatus != null">
+        NOTICE_DISTRIBUTION_STATUS,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="batchId != null">
+        BATCH_ID,
+      </if>
+      <if test="purchaseContractUnitPrice != null">
+        PURCHASE_CONTRACT_UNIT_PRICE,
+      </if>
+      <if test="purchaseContractMoisture != null">
+        PURCHASE_CONTRACT_MOISTURE,
+      </if>
+      <if test="purchaseContractQualityindex != null">
+        PURCHASE_CONTRACT_QUALITYINDEX,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="noticeId != null">
+        #{noticeId,jdbcType=DECIMAL},
+      </if>
+      <if test="requesterGroupId != null">
+        #{requesterGroupId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="noticeCommerceMethod != null">
+        #{noticeCommerceMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeHandoverMethod != null">
+        #{noticeHandoverMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="portId != null">
+        #{portId,jdbcType=DECIMAL},
+      </if>
+      <if test="noticePortConstructionFee != null">
+        #{noticePortConstructionFee,jdbcType=DECIMAL},
+      </if>
+      <if test="noticeDeliveryTime != null">
+        #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="noticePileFreeDays != null">
+        #{noticePileFreeDays,jdbcType=DECIMAL},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeDistributionStatus != null">
+        #{noticeDistributionStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="batchId != null">
+        #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="purchaseContractUnitPrice != null">
+        #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="purchaseContractMoisture != null">
+        #{purchaseContractMoisture,jdbcType=VARCHAR},
+      </if>
+      <if test="purchaseContractQualityindex != null">
+        #{purchaseContractQualityindex,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
+    update AMSSHIP_DELIVERY_NOTICE
+    set REQUESTER_GROUP_ID = #{requesterGroupId,jdbcType=DECIMAL},
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+        NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod,jdbcType=VARCHAR},
+        NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
+        PORT_ID = #{portId,jdbcType=DECIMAL},
+        NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
+        NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+        NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+        PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+        PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
+        PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex,jdbcType=VARCHAR}
+    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsshipDeliveryNotice">
+    update AMSSHIP_DELIVERY_NOTICE
+    <set>
+      <if test="requesterGroupId != null">
+        REQUESTER_GROUP_ID = #{requesterGroupId,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="noticeCommerceMethod != null">
+        NOTICE_COMMERCE_METHOD = #{noticeCommerceMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeHandoverMethod != null">
+        NOTICE_HANDOVER_METHOD = #{noticeHandoverMethod,jdbcType=VARCHAR},
+      </if>
+      <if test="portId != null">
+        PORT_ID = #{portId,jdbcType=DECIMAL},
+      </if>
+      <if test="noticePortConstructionFee != null">
+        NOTICE_PORT_CONSTRUCTION_FEE = #{noticePortConstructionFee,jdbcType=DECIMAL},
+      </if>
+      <if test="noticeDeliveryTime != null">
+        NOTICE_DELIVERY_TIME = #{noticeDeliveryTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="noticePileFreeDays != null">
+        NOTICE_PILE_FREE_DAYS = #{noticePileFreeDays,jdbcType=DECIMAL},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="noticeDistributionStatus != null">
+        NOTICE_DISTRIBUTION_STATUS = #{noticeDistributionStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="batchId != null">
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="purchaseContractUnitPrice != null">
+        PURCHASE_CONTRACT_UNIT_PRICE = #{purchaseContractUnitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="purchaseContractMoisture != null">
+        PURCHASE_CONTRACT_MOISTURE = #{purchaseContractMoisture,jdbcType=VARCHAR},
+      </if>
+      <if test="purchaseContractQualityindex != null">
+        PURCHASE_CONTRACT_QUALITYINDEX = #{purchaseContractQualityindex,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where NOTICE_ID = #{noticeId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMSSHIP_DELIVERY_NOTICE
+    (NOTICE_ID,
+    REQUESTER_GROUP_ID, CARRIER_ID,
+    NOTICE_COMMERCE_METHOD, NOTICE_HANDOVER_METHOD,
+    PORT_ID, NOTICE_PORT_CONSTRUCTION_FEE,
+    NOTICE_DELIVERY_TIME, NOTICE_PILE_FREE_DAYS,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    NOTICE_DISTRIBUTION_STATUS, DELETED,
+    BATCH_ID, PURCHASE_CONTRACT_UNIT_PRICE,
+    PURCHASE_CONTRACT_MOISTURE, PURCHASE_CONTRACT_QUALITYINDEX
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.noticeId,jdbcType=DECIMAL},
+    #{item.requesterGroupId,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL},
+    #{item.noticeCommerceMethod,jdbcType=VARCHAR}, #{item.noticeHandoverMethod,jdbcType=VARCHAR},
+    #{item.portId,jdbcType=DECIMAL}, #{item.noticePortConstructionFee,jdbcType=DECIMAL},
+    #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}, #{item.noticePileFreeDays,jdbcType=DECIMAL},
+    #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.noticeDistributionStatus,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseContractUnitPrice,jdbcType=DECIMAL},
+    #{item.purchaseContractMoisture,jdbcType=VARCHAR}, #{item.purchaseContractQualityindex,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update AMSSHIP_DELIVERY_NOTICE
+    set
+    NOTICE_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeId,jdbcType=DECIMAL}
+    </foreach>
+    ,REQUESTER_GROUP_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.requesterGroupId,jdbcType=DECIMAL}
+    </foreach>
+    ,CARRIER_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_COMMERCE_METHOD=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeCommerceMethod,jdbcType=VARCHAR}
+    </foreach>
+    ,NOTICE_HANDOVER_METHOD=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeHandoverMethod,jdbcType=VARCHAR}
+    </foreach>
+    ,PORT_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.portId,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_PORT_CONSTRUCTION_FEE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePortConstructionFee,jdbcType=DECIMAL}
+    </foreach>
+    ,NOTICE_DELIVERY_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDeliveryTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,NOTICE_PILE_FREE_DAYS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticePileFreeDays,jdbcType=DECIMAL}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,NOTICE_DISTRIBUTION_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.noticeDistributionStatus,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,BATCH_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_CONTRACT_UNIT_PRICE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractUnitPrice,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_CONTRACT_MOISTURE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractMoisture,jdbcType=VARCHAR}
+    </foreach>
+    ,PURCHASE_CONTRACT_QUALITYINDEX=
+    <foreach collection="list" item="item" index="index" separator=" " open="case NOTICE_ID" close="end">
+      when #{item.noticeId,jdbcType=DECIMAL} then #{item.purchaseContractQualityindex,jdbcType=VARCHAR}
+    </foreach>
+    where NOTICE_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.noticeId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMSSHIP_DELIVERY_NOTICE
+    where NOTICE_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectShipDeliveryNotice" resultType="java.util.Map">
+    select *
+    from
+    (
+    select
+    t3.SHIPPER_NAME  "shipperName",
+    t4.CARRIER_NAME "carrierName",
+
+    t1.NOTICE_COMMERCE_METHOD   "noticeCommerceMethod",
+    t1.NOTICE_HANDOVER_METHOD   "noticeHandoverMethod",
+    t1.NOTICE_PORT_CONSTRUCTION_FEE  "noticePortConstructionFee",
+    t1.NOTICE_DELIVERY_TIME  "noticeDeliveryTime",
+    t1.NOTICE_PILE_FREE_DAYS  "noticePileFreeDays",
+    t1.PURCHASE_CONTRACT_UNIT_PRICE "purchaseContractUnitPrice",
+    t1.PURCHASE_CONTRACT_MOISTURE "purchaseContractMoisture",
+    t1.PURCHASE_CONTRACT_QUALITYINDEX "purchaseContractQualityindex",
+    t8.MATERIAL_NAME "materialName",
+    t7.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+
+    t5.RESULT_NUMBER_OF_LOANS  "resultNumberOfLoans",
+    t6.PORT_NAME "portName",
+    t1.NOTICE_ID  "noticeId",
+    t1.BATCH_ID "batchId"
+
+    from  AMSSHIP_DELIVERY_NOTICE t1
+    left join RMS_SHIPPER t3
+    on t1.REQUESTER_GROUP_ID=t3.SHIPPER_ID
+    left join APPOINT_CARRIER t4
+    on t1.CARRIER_ID=t4.CARRIER_ID
+    left join AMSSHIP_CARGO_TRANSFER_RESULT t5
+    on t1.BATCH_ID=t5.BATCH_ID
+    left join  RMS_PORT t6
+    on t1.PORT_ID=t6.PORT_ID
+    left join  DIL_BATCH t7
+    on t1.BATCH_ID=t7.BATCH_ID
+    left join RMS_MATERIAL t8
+    on t7.MATERIAL_ID=t8.MATERIAL_ID
+
+    where  t1.deleted = 0
+    )
+    <where>
+      <if test="materialCapacityName!= null">
+        and t1.MATERIAL_CAPACITY_NAME in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="noticeCommerceMethod!= null">
+        and t1.NOTICE_COMMERCE_METHOD in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="noticeHandoverMethod!= null">
+        and t1.NOTICE_HANDOVER_METHOD in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="noticePortConstructionFee!= null">
+        and t1.NOTICE_PORT_CONSTRUCTION_FEE in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="noticeDeliveryTime!= null">
+        and   t1.NOTICE_DELIVERY_TIME in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="noticePileFreeDays!= null">
+        and   t1.NOTICE_PILE_FREE_DAYS in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="shipperName!= null">
+        and   t3.SHIPPER_NAME in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="carrierName!= null">
+        and   t4.CARRIER_NAME in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="resultNumberOfLoans!= null">
+        and    t5.RESULT_NUMBER_OF_LOANS in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    <where>
+      <if test="portName!= null">
+        and    t6.PORT_NAME in
+        <foreach collection="resultNumber" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+  </select>
+  <!-- 自动生成id-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(NOTICE_ID)+1 FROM AMSSHIP_DELIVERY_NOTICE
+  </select>
+  <!--  下拉框中获取货权转移编号 -->
+  <select id="getResultNumber" resultType="java.util.LinkedHashMap">
+    select
+      CARGO.CARGO_TRANSFER_RESULT_ID "id",
+      CARGO.CARGO_TRANSFER_RESULT_ID "value",
+      CARGO.RESULT_NUMBER "label"
+    from
+      AMSSHIP_CARGO_TRANSFER_RESULT   CARGO
+  </select>
+  <!--  下拉框中获取承运单位 -->
+  <select id="getcarrier" resultType="java.util.LinkedHashMap">
+    select
+      AC.CARRIER_ID   "id",
+      AC.CARRIER_ID   "value",
+      AC.CARRIER_NAME  "label"
+    from
+      APPOINT_CARRIER   AC
+  </select>
+  <!--  下拉框中获取托运单位 -->
+  <select id="getShipper" resultType="java.util.LinkedHashMap">
+    select
+      RS.SHIPPER_ID "id",
+      RS.SHIPPER_ID "value",
+      RS.SHIPPER_NAME "label"
+    from
+      RMS_SHIPPER RS
+  </select>
+  <!--  &lt;!&ndash;  下拉框中获取采购订单号 &ndash;&gt;-->
+  <!--  <select id="getOrderNo" resultType="java.util.LinkedHashMap">-->
+  <!--    select-->
+  <!--      APO.PURCHASE_ORDER_ID "id",-->
+  <!--      APO.PURCHASE_ORDER_ID "value",-->
+  <!--      APO.PURCHASE_ORDER_NO "label"-->
+  <!--    from-->
+  <!--      AMS_PURCHASE_ORDER APO-->
+  <!--  </select>-->
+  <select id="selectByNoticeId" resultType="java.util.Map">
+    select
+           t1.BATCH_ID "batchId",
+           t1.REQUESTER_GROUP_ID "requesterGroupId",
+           t1.CARRIER_ID  "carrierId",
+           t1.NOTICE_COMMERCE_METHOD "noticeCommerceMethod",
+           t1.NOTICE_HANDOVER_METHOD "noticeHandoverMethod",
+           t1.PORT_ID  "portId",
+           t1.NOTICE_PORT_CONSTRUCTION_FEE "noticePortConstructionFee",
+           t1.NOTICE_DELIVERY_TIME "noticeDeliveryTime",
+           t1.NOTICE_PILE_FREE_DAYS "noticePileFreeDays",
+           t1.PURCHASE_CONTRACT_UNIT_PRICE "purchaseContractUnitPrice",
+           t1.PURCHASE_CONTRACT_MOISTURE "purchaseContractMoisture",
+           t1.PURCHASE_CONTRACT_QUALITYINDEX "purchaseContractQualityindex",
+           t1.NOTICE_DISTRIBUTION_STATUS "noticeDistrbutionStatus"
+    from
+            AMSSHIP_DELIVERY_NOTICE t1
+    where
+            t1.NOTICE_ID=#{noticeId}
+  </select>
+
+</mapper>

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

@@ -0,0 +1,554 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.OmsshipInstructionsCapacityMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
+    <id column="INSTRUCTIONS_CAPACITY_ID" jdbcType="DECIMAL" property="instructionsCapacityId" />
+    <result column="INSTRUCTIONS_ID" jdbcType="DECIMAL" property="instructionsId" />
+    <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+    <result column="INSTRUCTION_PLANNED_LOADING" jdbcType="DECIMAL" property="instructionPlannedLoading" />
+    <result column="INSTRUCTIONS_SHIP_POSITION" jdbcType="VARCHAR" property="instructionsShipPosition" />
+    <result column="INSTRUCTION_CONTACT_INF" jdbcType="VARCHAR" property="instructionContactInf" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="INSTRUCTIONS_CAPACITY_STATUS" jdbcType="VARCHAR" property="instructionsCapacityStatus" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="INSTRUCTION_ESARRIVAL_TIME" jdbcType="TIMESTAMP" property="instructionEsarrivalTime" />
+  </resultMap>
+  <sql id="columns">
+    INSTRUCTIONS_CAPACITY_ID, INSTRUCTIONS_ID, CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
+    INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF, INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
+    DELETED, INSTRUCTION_ESARRIVAL_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.INSTRUCTIONS_CAPACITY_ID, t.INSTRUCTIONS_ID, t.CAPACITY_ID, t.INSTRUCTION_PLANNED_LOADING,
+    t.INSTRUCTIONS_SHIP_POSITION, t.INSTRUCTION_CONTACT_INF, t.INSERT_USERNAME, t.INSERT_TIME,
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.INSTRUCTIONS_CAPACITY_STATUS,
+    t.DELETED, t.INSTRUCTION_ESARRIVAL_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM OMSSHIP_INSTRUCTIONS_CAPACITY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM OMSSHIP_INSTRUCTIONS_CAPACITY t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="instructionsCapacityId != null">
+        and INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
+      </if>
+      <if test="instructionsId != null">
+        and INSTRUCTIONS_ID = #{instructionsId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="instructionPlannedLoading != null">
+        and INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
+      </if>
+      <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
+        and INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition}
+      </if>
+      <if test="instructionContactInf != null and instructionContactInf != ''">
+        and INSTRUCTION_CONTACT_INF = #{instructionContactInf}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
+        and INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="instructionEsarrivalTime != null">
+        and TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = #{instructionEsarrivalTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="instructionsCapacityId != null">
+        and INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
+      </if>
+      <if test="instructionsId != null">
+        and INSTRUCTIONS_ID = #{instructionsId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="instructionPlannedLoading != null">
+        and INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
+      </if>
+      <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
+        and INSTRUCTIONS_SHIP_POSITION LIKE '%${instructionsShipPosition}%'
+      </if>
+      <if test="instructionContactInf != null and instructionContactInf != ''">
+        and INSTRUCTION_CONTACT_INF LIKE '%${instructionContactInf}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
+        and INSTRUCTIONS_CAPACITY_STATUS LIKE '%${instructionsCapacityStatus}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="instructionEsarrivalTime != null">
+        and TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = #{instructionEsarrivalTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
+    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
+    where 1!=1
+    <if test="instructionsId != null">
+      or INSTRUCTIONS_ID = #{instructionsId}
+    </if>
+    <if test="capacityId != null">
+      or CAPACITY_ID = #{capacityId}
+    </if>
+    <if test="instructionPlannedLoading != null">
+      or INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading}
+    </if>
+    <if test="instructionsShipPosition != null and instructionsShipPosition != ''">
+      or INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition}
+    </if>
+    <if test="instructionContactInf != null and instructionContactInf != ''">
+      or INSTRUCTION_CONTACT_INF = #{instructionContactInf}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="instructionsCapacityStatus != null and instructionsCapacityStatus != ''">
+      or INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="instructionEsarrivalTime != null">
+      or TO_CHAR(INSTRUCTION_ESARRIVAL_TIME,'yyyy-MM-dd') = '#{instructionEsarrivalTime}'
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
+    insert into OMSSHIP_INSTRUCTIONS_CAPACITY (INSTRUCTIONS_CAPACITY_ID, INSTRUCTIONS_ID,
+      CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
+      INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF,
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+      UPDATE_TIME, INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
+      DELETED, INSTRUCTION_ESARRIVAL_TIME)
+    values (#{instructionsCapacityId,jdbcType=DECIMAL}, #{instructionsId,jdbcType=DECIMAL},
+      #{capacityId,jdbcType=DECIMAL}, #{instructionPlannedLoading,jdbcType=DECIMAL},
+      #{instructionsShipPosition,jdbcType=VARCHAR}, #{instructionContactInf,jdbcType=VARCHAR},
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{instructionsCapacityStatus,jdbcType=VARCHAR},
+      #{deleted,jdbcType=DECIMAL}, #{instructionEsarrivalTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
+    insert into OMSSHIP_INSTRUCTIONS_CAPACITY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="instructionsCapacityId != null">
+        INSTRUCTIONS_CAPACITY_ID,
+      </if>
+      <if test="instructionsId != null">
+        INSTRUCTIONS_ID,
+      </if>
+      <if test="capacityId != null">
+        CAPACITY_ID,
+      </if>
+      <if test="instructionPlannedLoading != null">
+        INSTRUCTION_PLANNED_LOADING,
+      </if>
+      <if test="instructionsShipPosition != null">
+        INSTRUCTIONS_SHIP_POSITION,
+      </if>
+      <if test="instructionContactInf != null">
+        INSTRUCTION_CONTACT_INF,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="instructionsCapacityStatus != null">
+        INSTRUCTIONS_CAPACITY_STATUS,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="instructionEsarrivalTime != null">
+        INSTRUCTION_ESARRIVAL_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="instructionsCapacityId != null">
+        #{instructionsCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionsId != null">
+        #{instructionsId,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityId != null">
+        #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionPlannedLoading != null">
+        #{instructionPlannedLoading,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionsShipPosition != null">
+        #{instructionsShipPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="instructionContactInf != null">
+        #{instructionContactInf,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="instructionsCapacityStatus != null">
+        #{instructionsCapacityStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionEsarrivalTime != null">
+        #{instructionEsarrivalTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
+    update OMSSHIP_INSTRUCTIONS_CAPACITY
+    set INSTRUCTIONS_ID = #{instructionsId,jdbcType=DECIMAL},
+      CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading,jdbcType=DECIMAL},
+      INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition,jdbcType=VARCHAR},
+      INSTRUCTION_CONTACT_INF = #{instructionContactInf,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      INSTRUCTION_ESARRIVAL_TIME = #{instructionEsarrivalTime,jdbcType=TIMESTAMP}
+    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmsshipInstructionsCapacity">
+    update OMSSHIP_INSTRUCTIONS_CAPACITY
+    <set>
+      <if test="instructionsId != null">
+        INSTRUCTIONS_ID = #{instructionsId,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityId != null">
+        CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionPlannedLoading != null">
+        INSTRUCTION_PLANNED_LOADING = #{instructionPlannedLoading,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionsShipPosition != null">
+        INSTRUCTIONS_SHIP_POSITION = #{instructionsShipPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="instructionContactInf != null">
+        INSTRUCTION_CONTACT_INF = #{instructionContactInf,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="instructionsCapacityStatus != null">
+        INSTRUCTIONS_CAPACITY_STATUS = #{instructionsCapacityStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionEsarrivalTime != null">
+        INSTRUCTION_ESARRIVAL_TIME = #{instructionEsarrivalTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into OMSSHIP_INSTRUCTIONS_CAPACITY
+    (INSTRUCTIONS_CAPACITY_ID,
+    INSTRUCTIONS_ID, CAPACITY_ID, INSTRUCTION_PLANNED_LOADING,
+    INSTRUCTIONS_SHIP_POSITION, INSTRUCTION_CONTACT_INF,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, INSTRUCTIONS_CAPACITY_STATUS,
+    DELETED, INSTRUCTION_ESARRIVAL_TIME
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.instructionsCapacityId,jdbcType=DECIMAL},
+    #{item.instructionsId,jdbcType=DECIMAL}, #{item.capacityId,jdbcType=DECIMAL}, #{item.instructionPlannedLoading,jdbcType=DECIMAL},
+    #{item.instructionsShipPosition,jdbcType=VARCHAR}, #{item.instructionContactInf,jdbcType=VARCHAR},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.instructionsCapacityStatus,jdbcType=VARCHAR},
+    #{item.deleted,jdbcType=DECIMAL}, #{item.instructionEsarrivalTime,jdbcType=TIMESTAMP}
+    from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update OMSSHIP_INSTRUCTIONS_CAPACITY
+    set
+    INSTRUCTIONS_CAPACITY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsCapacityId,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTIONS_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsId,jdbcType=DECIMAL}
+    </foreach>
+    ,CAPACITY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTION_PLANNED_LOADING=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionPlannedLoading,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTIONS_SHIP_POSITION=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsShipPosition,jdbcType=VARCHAR}
+    </foreach>
+    ,INSTRUCTION_CONTACT_INF=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionContactInf,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,INSTRUCTIONS_CAPACITY_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionsCapacityStatus,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTION_ESARRIVAL_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case INSTRUCTIONS_CAPACITY_ID" close="end">
+      when #{item.instructionsCapacityId,jdbcType=DECIMAL} then #{item.instructionEsarrivalTime,jdbcType=TIMESTAMP}
+    </foreach>
+    where INSTRUCTIONS_CAPACITY_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.instructionsCapacityId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from OMSSHIP_INSTRUCTIONS_CAPACITY
+    where INSTRUCTIONS_CAPACITY_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectOrderId" resultType="java.util.LinkedHashMap">
+    SELECT
+    oic.INSTRUCTIONS_CAPACITY_ID "id",
+    oic.INSTRUCTIONS_CAPACITY_ID "value",
+    oic.INSTRUCTIONS_CAPACITY_ID "label"
+    FROM
+    OMSSHIP_INSTRUCTIONS_CAPACITY oic
+  </select>
+
+  <!--获得最大id-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(INSTRUCTIONS_CAPACITY_ID)+1 FROM OMSSHIP_INSTRUCTIONS_CAPACITY
+  </select>
+  <sql id="orderByInsertTime">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+  </sql>
+  <!--查询一条装船指令下的船只信息-->
+  <select id="selectCapacities" resultType="java.util.Map">
+    SELECT * FROM
+    (SELECT
+    oic.INSTRUCTIONS_ID as "instructionsId",
+    oic.INSERT_TIME as "insertTime",
+    oic.INSTRUCTIONS_CAPACITY_ID as "orderId",
+    rc.CAPACITY_NUMBER as "capacityName",
+    oic.INSTRUCTIONS_CAPACITY_STATUS as "isEmpty",
+    oic.INSTRUCTIONS_SHIP_POSITION as "nowLocation",
+    oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
+    oic.INSTRUCTION_CONTACT_INF as "phoneNumber",
+    oic.INSTRUCTION_ESARRIVAL_TIME as "esArrivalTime"
+    FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
+    LEFT JOIN RMS_CAPACITY rc
+    ON oic.CAPACITY_ID = rc.CAPACITY_ID
+    WHERE oic.INSTRUCTIONS_ID = #{instructionsId}
+    AND oic.DELETED=0)
+    <where>
+      <if test="capacityName!= null">
+        and
+        <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+          "capacityName" in  #{item}
+        </foreach>
+      </if>
+      <if test="isEmpty!= null">
+        and
+        <foreach collection="isEmpty" item="item" open="(" separator="," close=")">
+          "isEmpty" in  #{item}
+        </foreach>
+      </if>
+      <if test="nowLocation!= null">
+        and
+        <foreach collection="nowLocation" item="item" open="(" separator="," close=")">
+          "nowLocation" in  #{item}
+        </foreach>
+      </if>
+      <if test="planWeight!= null">
+        and
+        <foreach collection="planWeight" item="item" open="(" separator="," close=")">
+          "planWeight" in  #{item}
+        </foreach>
+      </if>
+      <if test="phoneNumber!= null">
+        and
+        <foreach collection="phoneNumber" item="item" open="(" separator="," close=")">
+          "phoneNumber" in  #{item}
+        </foreach>
+      </if>
+      <if test="esArrivalTime!= null">
+        and
+        <foreach collection="esArrivalTime" item="item" open="(" separator="," close=")">
+          "esArrivalTime" in  #{item}
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByInsertTime"></include>
+  </select>
+
+  <select id="selectCapacityId" resultType="java.util.LinkedHashMap">
+    SELECT
+    rc.CAPACITY_ID "id",
+    rc.CAPACITY_ID "value",
+    rc.CAPACITY_NUMBER "label"
+    FROM RMS_CAPACITY rc
+    WHERE rc.CAPACITY_TYPE_ID = 3
+  </select>
+
+  <select id="selectInstructionsCapacity" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT
+    CAPACITY_ID "capacityId",
+    INSTRUCTION_PLANNED_LOADING "instructionPlannedLoading",
+    INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition",
+    INSTRUCTION_CONTACT_INF "instructionContactInf",
+    INSTRUCTIONS_CAPACITY_STATUS "instructionsCapacityStatus",
+    INSTRUCTION_ESARRIVAL_TIME "instructionEsarrivalTime"
+    FROM OMSSHIP_INSTRUCTIONS_CAPACITY
+    WHERE INSTRUCTIONS_CAPACITY_ID = #{instructionsCapacityId}
+  </select>
+</mapper>

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

@@ -0,0 +1,601 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.OmsshipShipmentInstructionsMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmsshipShipmentInstructions">
+    <id column="SHIPMENT_INSTRUCTIONS_ID" jdbcType="DECIMAL" property="shipmentInstructionsId" />
+    <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
+    <result column="RECIPIENT_CARRIER_ID" jdbcType="DECIMAL" property="recipientCarrierId" />
+    <result column="PORT_CARRIER_ID" jdbcType="DECIMAL" property="portCarrierId" />
+    <result column="INSTRUCTIONS_TOTAL_TONNAGE" jdbcType="DECIMAL" property="instructionsTotalTonnage" />
+    <result column="INSTRUCTION_TIME" jdbcType="TIMESTAMP" property="instructionTime" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="INSTRUCTION_ISSUE_STATUS" jdbcType="VARCHAR" property="instructionIssueStatus" />
+  </resultMap>
+  <sql id="columns">
+    SHIPMENT_INSTRUCTIONS_ID, BATCH_ID, RECIPIENT_CARRIER_ID, PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
+    INSTRUCTION_TIME, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, INSTRUCTION_ISSUE_STATUS
+  </sql>
+  <sql id="columns_alias">
+    t.SHIPMENT_INSTRUCTIONS_ID, t.BATCH_ID, t.RECIPIENT_CARRIER_ID, t.PORT_CARRIER_ID,
+    t.INSTRUCTIONS_TOTAL_TONNAGE, t.INSTRUCTION_TIME, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.INSTRUCTION_ISSUE_STATUS
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM OMSSHIP_SHIPMENT_INSTRUCTIONS t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="shipmentInstructionsId != null">
+        and SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="recipientCarrierId != null">
+        and RECIPIENT_CARRIER_ID = #{recipientCarrierId}
+      </if>
+      <if test="portCarrierId != null">
+        and PORT_CARRIER_ID = #{portCarrierId}
+      </if>
+      <if test="instructionsTotalTonnage != null">
+        and INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
+      </if>
+      <if test="instructionTime != null">
+        and TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = #{instructionTime}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="instructionIssueStatus != null and instructionIssueStatus != ''">
+        and INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="shipmentInstructionsId != null">
+        and SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
+      </if>
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="recipientCarrierId != null">
+        and RECIPIENT_CARRIER_ID = #{recipientCarrierId}
+      </if>
+      <if test="portCarrierId != null">
+        and PORT_CARRIER_ID = #{portCarrierId}
+      </if>
+      <if test="instructionsTotalTonnage != null">
+        and INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
+      </if>
+      <if test="instructionTime != null">
+        and TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = #{instructionTime}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="instructionIssueStatus != null and instructionIssueStatus != ''">
+        and INSTRUCTION_ISSUE_STATUS LIKE '%${instructionIssueStatus}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from OMSSHIP_SHIPMENT_INSTRUCTIONS
+    where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from OMSSHIP_SHIPMENT_INSTRUCTIONS
+    where 1!=1
+    <if test="batchId != null">
+      or BATCH_ID = #{batchId}
+    </if>
+    <if test="recipientCarrierId != null">
+      or RECIPIENT_CARRIER_ID = #{recipientCarrierId}
+    </if>
+    <if test="portCarrierId != null">
+      or PORT_CARRIER_ID = #{portCarrierId}
+    </if>
+    <if test="instructionsTotalTonnage != null">
+      or INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage}
+    </if>
+    <if test="instructionTime != null">
+      or TO_CHAR(INSTRUCTION_TIME,'yyyy-MM-dd') = '#{instructionTime}'
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="instructionIssueStatus != null and instructionIssueStatus != ''">
+      or INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
+    insert into OMSSHIP_SHIPMENT_INSTRUCTIONS (SHIPMENT_INSTRUCTIONS_ID, BATCH_ID,
+      RECIPIENT_CARRIER_ID, PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
+      INSTRUCTION_TIME, DELETE_NAME, DELETE_TIME,
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+      UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+      INSTRUCTION_ISSUE_STATUS)
+    values (#{shipmentInstructionsId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
+      #{recipientCarrierId,jdbcType=DECIMAL}, #{portCarrierId,jdbcType=DECIMAL}, #{instructionsTotalTonnage,jdbcType=DECIMAL},
+      #{instructionTime,jdbcType=TIMESTAMP}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+      #{instructionIssueStatus,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
+    insert into OMSSHIP_SHIPMENT_INSTRUCTIONS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="shipmentInstructionsId != null">
+        SHIPMENT_INSTRUCTIONS_ID,
+      </if>
+      <if test="batchId != null">
+        BATCH_ID,
+      </if>
+      <if test="recipientCarrierId != null">
+        RECIPIENT_CARRIER_ID,
+      </if>
+      <if test="portCarrierId != null">
+        PORT_CARRIER_ID,
+      </if>
+      <if test="instructionsTotalTonnage != null">
+        INSTRUCTIONS_TOTAL_TONNAGE,
+      </if>
+      <if test="instructionTime != null">
+        INSTRUCTION_TIME,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="instructionIssueStatus != null">
+        INSTRUCTION_ISSUE_STATUS,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="shipmentInstructionsId != null">
+        #{shipmentInstructionsId,jdbcType=DECIMAL},
+      </if>
+      <if test="batchId != null">
+        #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="recipientCarrierId != null">
+        #{recipientCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="portCarrierId != null">
+        #{portCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionsTotalTonnage != null">
+        #{instructionsTotalTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionTime != null">
+        #{instructionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionIssueStatus != null">
+        #{instructionIssueStatus,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
+    update OMSSHIP_SHIPMENT_INSTRUCTIONS
+    set BATCH_ID = #{batchId,jdbcType=DECIMAL},
+      RECIPIENT_CARRIER_ID = #{recipientCarrierId,jdbcType=DECIMAL},
+      PORT_CARRIER_ID = #{portCarrierId,jdbcType=DECIMAL},
+      INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage,jdbcType=DECIMAL},
+      INSTRUCTION_TIME = #{instructionTime,jdbcType=TIMESTAMP},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus,jdbcType=VARCHAR}
+    where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmsshipShipmentInstructions">
+    update OMSSHIP_SHIPMENT_INSTRUCTIONS
+    <set>
+      <if test="batchId != null">
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="recipientCarrierId != null">
+        RECIPIENT_CARRIER_ID = #{recipientCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="portCarrierId != null">
+        PORT_CARRIER_ID = #{portCarrierId,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionsTotalTonnage != null">
+        INSTRUCTIONS_TOTAL_TONNAGE = #{instructionsTotalTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionTime != null">
+        INSTRUCTION_TIME = #{instructionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="instructionIssueStatus != null">
+        INSTRUCTION_ISSUE_STATUS = #{instructionIssueStatus,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into OMSSHIP_SHIPMENT_INSTRUCTIONS
+    (SHIPMENT_INSTRUCTIONS_ID,
+    BATCH_ID, RECIPIENT_CARRIER_ID,
+    PORT_CARRIER_ID, INSTRUCTIONS_TOTAL_TONNAGE,
+    INSTRUCTION_TIME, DELETE_NAME,
+    DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    INSTRUCTION_ISSUE_STATUS)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.shipmentInstructionsId,jdbcType=DECIMAL},
+    #{item.batchId,jdbcType=DECIMAL}, #{item.recipientCarrierId,jdbcType=DECIMAL},
+    #{item.portCarrierId,jdbcType=DECIMAL}, #{item.instructionsTotalTonnage,jdbcType=DECIMAL},
+    #{item.instructionTime,jdbcType=TIMESTAMP}, #{item.deleteName,jdbcType=VARCHAR},
+    #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.instructionIssueStatus,jdbcType=VARCHAR} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update OMSSHIP_SHIPMENT_INSTRUCTIONS
+    set
+    SHIPMENT_INSTRUCTIONS_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.shipmentInstructionsId,jdbcType=DECIMAL}
+    </foreach>
+    ,BATCH_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+    </foreach>
+    ,RECIPIENT_CARRIER_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.recipientCarrierId,jdbcType=DECIMAL}
+    </foreach>
+    ,PORT_CARRIER_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.portCarrierId,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTIONS_TOTAL_TONNAGE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionsTotalTonnage,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTION_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,INSTRUCTION_ISSUE_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case SHIPMENT_INSTRUCTIONS_ID" close="end">
+      when #{item.shipmentInstructionsId,jdbcType=DECIMAL} then #{item.instructionIssueStatus,jdbcType=VARCHAR}
+    </foreach>
+    where SHIPMENT_INSTRUCTIONS_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.shipmentInstructionsId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from OMSSHIP_SHIPMENT_INSTRUCTIONS
+    where SHIPMENT_INSTRUCTIONS_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <sql id="orderByInsertTime">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+  </sql>
+  <select id="selectAll"  resultType="java.util.Map">
+    select *
+    from(
+    select distinct
+    osi.SHIPMENT_INSTRUCTIONS_ID "instructionsId",
+    osi.INSERT_TIME "insertTime",
+    rpi.PIER_NAME "piername",
+    rpo.PORT_NAME  "portname",
+    rpo.PORT_NAME  "portname2",
+    rm.MATERIAL_NAME  "materialName",
+    db.RESULT_FOREIGN_SHIP_NAME "foreignShipName",
+    rs.SHIPPER_NAME  "shipperName",
+    rs.SHIPPER_CONTACT_NUMBER  "shipperContactNumber",
+    osi.INSTRUCTION_TIME "instructionTime",
+    osi.INSTRUCTIONS_TOTAL_TONNAGE "instruct"
+    from  OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+    left join AMSSHIP_DELIVERY_ATTORNEY ada
+    on  osi.BATCH_ID = ada.BATCH_ID
+    left join RMS_PIER rpi
+    on osi.RECIPIENT_CARRIER_ID=rpi.PIER_ID
+    left join  RMS_PORT rpo
+    on osi.PORT_CARRIER_ID=rpo.PORT_ID
+    left join AMSSHIP_DELIVERY_NOTICE adn
+    on ada.BATCH_ID=adn.BATCH_ID
+    left join DIL_BATCH db
+    on osi.BATCH_ID = db.BATCH_ID
+    left join RMS_MATERIAL rm
+    on db.MATERIAL_ID = rm.MATERIAL_ID
+    left join RMS_SHIPPER rs
+    on adn.REQUESTER_GROUP_ID=rs.SHIPPER_ID
+    where osi.DELETED = 0
+    )
+    <where>
+      <if test="piername!= null">
+        and
+        <foreach collection="piername" item="item" open="(" separator="," close=")">
+          "piername" in  #{item}
+        </foreach>
+      </if>
+      <if test="portname!= null">
+        and
+        <foreach collection="portname" item="item" open="(" separator="," close=")">
+          "portname"  in  #{item}
+        </foreach>
+      </if>
+      <if test="portname2!= null">
+        and
+        <foreach collection="portname2" item="item" open="(" separator="," close=")">
+          "portname2" in  #{item}
+        </foreach>
+      </if>
+      <if test="materialName!= null">
+        and
+        <foreach collection="materialName" item="item" open="(" separator="," close=")">
+          "materialName" in  #{item}
+        </foreach>
+      </if>
+      <if test="foreignShipName!= null">
+        and
+        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+          "foreignShipName" in  #{item}
+        </foreach>
+      </if>
+      <if test="shipperName!= null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="," close=")">
+          "shipperName" in  #{item}
+        </foreach>
+      </if>
+      <if test="shipperContactNumber!= null">
+        and
+        <foreach collection="shipperContactNumber" item="item" open="(" separator="," close=")">
+          "shipperContactNumber" in  #{item}
+        </foreach>
+      </if>
+      <if test="instructionTime!= null">
+        and
+        <foreach collection="instructionTime" item="item" open="(" separator="," close=")">
+          "instructionTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+        </foreach>
+      </if>
+      <if test="instruct!= null">
+        and
+        <foreach collection="instruct" item="item" open="(" separator="," close=")">
+          "instruct" in  #{item}
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByInsertTime"></include>
+  </select>
+  <!-- 自动生成id-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(SHIPMENT_INSTRUCTIONS_ID)+1 FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
+  </select>
+
+  <select id="selectShipmentInstructions" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT
+    BATCH_ID "batchId",
+    RECIPIENT_CARRIER_ID "recipientCarrierId",
+    PORT_CARRIER_ID "portCarrierId",
+    INSTRUCTIONS_TOTAL_TONNAGE "instructionsTotalTonnage",
+    INSTRUCTION_TIME "instructionTime"
+    FROM OMSSHIP_SHIPMENT_INSTRUCTIONS
+    WHERE SHIPMENT_INSTRUCTIONS_ID = #{shipmentInstructionsId}
+  </select>
+
+  <!--得到批次id-->
+  <select id="getBatchId" resultType="java.util.LinkedHashMap">
+    select
+      BATCH_ID "id",
+      BATCH_ID "value",
+      CONCAT(CONCAT(RM.MATERIAL_NAME, '"'), CONCAT(DB.RESULT_FOREIGN_SHIP_NAME, '"')) "label"
+    from DIL_BATCH DB
+           left join RMS_MATERIAL RM
+                     on RM.MATERIAL_ID = DB.MATERIAL_ID
+  </select>
+</mapper>

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

@@ -0,0 +1,628 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipBargeOperationMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipBargeOperation">
+    <id column="BARGE_OPERATION_ID" jdbcType="DECIMAL" property="bargeOperationId" />
+    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="BARGE_SMALLSHIP_LOAD_WEIGHT" jdbcType="DECIMAL" property="bargeSmallshipLoadWeight" />
+    <result column="SMALL_CAPACITY_ID" jdbcType="DECIMAL" property="smallCapacityId" />
+    <result column="BARGE_REFUTE_DATE" jdbcType="TIMESTAMP" property="bargeRefuteDate" />
+    <result column="BARGE_REFUTE_LOCATION" jdbcType="VARCHAR" property="bargeRefuteLocation" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="BARGE_BACK_DATE" jdbcType="TIMESTAMP" property="bargeBackDate" />
+    <result column="BARGE_BACK_LOCATION" jdbcType="VARCHAR" property="bargeBackLocation" />
+  </resultMap>
+  <sql id="columns">
+    BARGE_OPERATION_ID, RESULT_TOTAL_ID, BARGE_SMALLSHIP_LOAD_WEIGHT, SMALL_CAPACITY_ID,
+    BARGE_REFUTE_DATE, BARGE_REFUTE_LOCATION, DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, BARGE_BACK_DATE,
+    BARGE_BACK_LOCATION
+  </sql>
+  <sql id="columns_alias">
+    t.BARGE_OPERATION_ID, t.RESULT_TOTAL_ID, t.BARGE_SMALLSHIP_LOAD_WEIGHT, t.SMALL_CAPACITY_ID,
+    t.BARGE_REFUTE_DATE, t.BARGE_REFUTE_LOCATION, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.BARGE_BACK_DATE, t.BARGE_BACK_LOCATION
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSSHIP_BARGE_OPERATION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSSHIP_BARGE_OPERATION t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="bargeOperationId != null">
+        and BARGE_OPERATION_ID = #{bargeOperationId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="bargeSmallshipLoadWeight != null">
+        and BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
+      </if>
+      <if test="smallCapacityId != null">
+        and SMALL_CAPACITY_ID = #{smallCapacityId}
+      </if>
+      <if test="bargeRefuteDate != null">
+        and TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = #{bargeRefuteDate}
+      </if>
+      <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
+        and BARGE_REFUTE_LOCATION = #{bargeRefuteLocation}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="bargeBackDate != null">
+        and TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = #{bargeBackDate}
+      </if>
+      <if test="bargeBackLocation != null and bargeBackLocation != ''">
+        and BARGE_BACK_LOCATION = #{bargeBackLocation}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="bargeOperationId != null">
+        and BARGE_OPERATION_ID = #{bargeOperationId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="bargeSmallshipLoadWeight != null">
+        and BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
+      </if>
+      <if test="smallCapacityId != null">
+        and SMALL_CAPACITY_ID = #{smallCapacityId}
+      </if>
+      <if test="bargeRefuteDate != null">
+        and TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = #{bargeRefuteDate}
+      </if>
+      <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
+        and BARGE_REFUTE_LOCATION LIKE '%${bargeRefuteLocation}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="bargeBackDate != null">
+        and TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = #{bargeBackDate}
+      </if>
+      <if test="bargeBackLocation != null and bargeBackLocation != ''">
+        and BARGE_BACK_LOCATION LIKE '%${bargeBackLocation}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSSHIP_BARGE_OPERATION
+    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSSHIP_BARGE_OPERATION
+    where 1!=1
+    <if test="resultTotalId != null">
+      or RESULT_TOTAL_ID = #{resultTotalId}
+    </if>
+    <if test="bargeSmallshipLoadWeight != null">
+      or BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight}
+    </if>
+    <if test="smallCapacityId != null">
+      or SMALL_CAPACITY_ID = #{smallCapacityId}
+    </if>
+    <if test="bargeRefuteDate != null">
+      or TO_CHAR(BARGE_REFUTE_DATE,'yyyy-MM-dd') = '#{bargeRefuteDate}'
+    </if>
+    <if test="bargeRefuteLocation != null and bargeRefuteLocation != ''">
+      or BARGE_REFUTE_LOCATION = #{bargeRefuteLocation}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="bargeBackDate != null">
+      or TO_CHAR(BARGE_BACK_DATE,'yyyy-MM-dd') = '#{bargeBackDate}'
+    </if>
+    <if test="bargeBackLocation != null and bargeBackLocation != ''">
+      or BARGE_BACK_LOCATION = #{bargeBackLocation}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
+    insert into TMSSHIP_BARGE_OPERATION (BARGE_OPERATION_ID, RESULT_TOTAL_ID,
+      BARGE_SMALLSHIP_LOAD_WEIGHT, SMALL_CAPACITY_ID,
+      BARGE_REFUTE_DATE, BARGE_REFUTE_LOCATION,
+      DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+      INSERT_UPDATE_REMARK, DELETED, BARGE_BACK_DATE,
+      BARGE_BACK_LOCATION)
+    values (#{bargeOperationId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
+      #{bargeSmallshipLoadWeight,jdbcType=DECIMAL}, #{smallCapacityId,jdbcType=DECIMAL},
+      #{bargeRefuteDate,jdbcType=TIMESTAMP}, #{bargeRefuteLocation,jdbcType=VARCHAR},
+      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{bargeBackDate,jdbcType=TIMESTAMP},
+      #{bargeBackLocation,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
+    insert into TMSSHIP_BARGE_OPERATION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="bargeOperationId != null">
+        BARGE_OPERATION_ID,
+      </if>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="bargeSmallshipLoadWeight != null">
+        BARGE_SMALLSHIP_LOAD_WEIGHT,
+      </if>
+      <if test="smallCapacityId != null">
+        SMALL_CAPACITY_ID,
+      </if>
+      <if test="bargeRefuteDate != null">
+        BARGE_REFUTE_DATE,
+      </if>
+      <if test="bargeRefuteLocation != null">
+        BARGE_REFUTE_LOCATION,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="bargeBackDate != null">
+        BARGE_BACK_DATE,
+      </if>
+      <if test="bargeBackLocation != null">
+        BARGE_BACK_LOCATION,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="bargeOperationId != null">
+        #{bargeOperationId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeSmallshipLoadWeight != null">
+        #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="smallCapacityId != null">
+        #{smallCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeRefuteDate != null">
+        #{bargeRefuteDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bargeRefuteLocation != null">
+        #{bargeRefuteLocation,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeBackDate != null">
+        #{bargeBackDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bargeBackLocation != null">
+        #{bargeBackLocation,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
+    update TMSSHIP_BARGE_OPERATION
+    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
+      SMALL_CAPACITY_ID = #{smallCapacityId,jdbcType=DECIMAL},
+      BARGE_REFUTE_DATE = #{bargeRefuteDate,jdbcType=TIMESTAMP},
+      BARGE_REFUTE_LOCATION = #{bargeRefuteLocation,jdbcType=VARCHAR},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      BARGE_BACK_DATE = #{bargeBackDate,jdbcType=TIMESTAMP},
+      BARGE_BACK_LOCATION = #{bargeBackLocation,jdbcType=VARCHAR}
+    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipBargeOperation">
+    update TMSSHIP_BARGE_OPERATION
+    <set>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeSmallshipLoadWeight != null">
+        BARGE_SMALLSHIP_LOAD_WEIGHT = #{bargeSmallshipLoadWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="smallCapacityId != null">
+        SMALL_CAPACITY_ID = #{smallCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeRefuteDate != null">
+        BARGE_REFUTE_DATE = #{bargeRefuteDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bargeRefuteLocation != null">
+        BARGE_REFUTE_LOCATION = #{bargeRefuteLocation,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="bargeBackDate != null">
+        BARGE_BACK_DATE = #{bargeBackDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="bargeBackLocation != null">
+        BARGE_BACK_LOCATION = #{bargeBackLocation,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where BARGE_OPERATION_ID = #{bargeOperationId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSSHIP_BARGE_OPERATION
+    (BARGE_OPERATION_ID,
+    RESULT_TOTAL_ID, BARGE_SMALLSHIP_LOAD_WEIGHT,
+    SMALL_CAPACITY_ID, BARGE_REFUTE_DATE,
+    BARGE_REFUTE_LOCATION, DELETE_NAME,
+    DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    BARGE_BACK_DATE, BARGE_BACK_LOCATION
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.bargeOperationId,jdbcType=DECIMAL},
+    #{item.resultTotalId,jdbcType=DECIMAL}, #{item.bargeSmallshipLoadWeight,jdbcType=DECIMAL},
+    #{item.smallCapacityId,jdbcType=DECIMAL}, #{item.bargeRefuteDate,jdbcType=TIMESTAMP},
+    #{item.bargeRefuteLocation,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
+    #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.bargeBackDate,jdbcType=TIMESTAMP}, #{item.bargeBackLocation,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update TMSSHIP_BARGE_OPERATION
+    set
+    BARGE_OPERATION_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeOperationId,jdbcType=DECIMAL}
+    </foreach>
+    ,RESULT_TOTAL_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+    </foreach>
+    ,BARGE_SMALLSHIP_LOAD_WEIGHT=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeSmallshipLoadWeight,jdbcType=DECIMAL}
+    </foreach>
+    ,SMALL_CAPACITY_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.smallCapacityId,jdbcType=DECIMAL}
+    </foreach>
+    ,BARGE_REFUTE_DATE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeRefuteDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,BARGE_REFUTE_LOCATION=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeRefuteLocation,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,BARGE_BACK_DATE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeBackDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,BARGE_BACK_LOCATION=
+    <foreach collection="list" item="item" index="index" separator=" " open="case BARGE_OPERATION_ID" close="end">
+      when #{item.bargeOperationId,jdbcType=DECIMAL} then #{item.bargeBackLocation,jdbcType=VARCHAR}
+    </foreach>
+    where BARGE_OPERATION_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.bargeOperationId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSSHIP_BARGE_OPERATION
+    where BARGE_OPERATION_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(BARGE_OPERATION_ID)+1 FROM TMSSHIP_BARGE_OPERATION
+  </select>
+
+  <!--查询驳船作业列表-->
+  <sql id="orderByInsertTime">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+  </sql>
+  <select id="selectBargeOperationList" resultType="java.util.Map">
+    select * from(
+    SELECT DISTINCT ttr.ORDER_ID as "orderId",
+    tbo.INSERT_TIME as "insertTime",
+    tbo.BARGE_OPERATION_ID as "bargeOperationId",
+    rm.MATERIAL_NAME as "materialName",
+    db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+    rcb.CAPACITY_NUMBER as "bigCapacityName",
+    tlsr.RESULT_ACTUAL_INSTALLATIONS as "bigCapacityWeight",
+    rcs.CAPACITY_NUMBER as "smallCapacityName",
+    tbo.BARGE_SMALLSHIP_LOAD_WEIGHT as "smallCapacityWeight",
+    tbo.BARGE_REFUTE_DATE as "bargeRefuteTime",
+    tbo.BARGE_REFUTE_LOCATION as "bargeRefuteLocation",
+    tbo.BARGE_BACK_DATE as "bargeBackTime",
+    tbo.BARGE_BACK_LOCATION as "bargeBackLocation"
+    FROM TMSSHIP_BARGE_OPERATION tbo
+    LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+    ON tbo.RESULT_TOTAL_ID = ttr.RESULT_ID
+    LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+    ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+    LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+    ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+    LEFT JOIN DIL_BATCH db
+    ON osi.BATCH_ID = db.BATCH_ID
+    LEFT JOIN RMS_MATERIAL rm
+    ON db.MATERIAL_ID = rm.MATERIAL_ID
+    LEFT JOIN RMS_CAPACITY rcb
+    ON oic.CAPACITY_ID = rcb.CAPACITY_ID
+    LEFT JOIN RMS_CAPACITY rcs
+    ON tbo.SMALL_CAPACITY_ID = rcs.CAPACITY_ID
+    LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+    ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+    where tbo.DELETED = 0)
+    <where>
+      <if test="materialName != null">
+        and
+        <foreach collection="materialName" item="item" open="(" separator="," close=")">
+          "materialName" in  #{item}
+        </foreach>
+      </if>
+      <if test="foreignShipName != null">
+        and
+        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+          "foreignShipName" in  #{item}
+        </foreach>
+      </if>
+      <if test="bigCapacityName != null">
+        and
+        <foreach collection="bigCapacityName" item="item" open="(" separator="," close=")">
+          "bigCapacityName" in  #{item}
+        </foreach>
+      </if>
+      <if test="bigCapacityWeight != null">
+        and
+        <foreach collection="bigCapacityWeight" item="item" open="(" separator="," close=")">
+          "bigCapacityWeight" in  #{item}
+        </foreach>
+      </if>
+      <if test="smallCapacityId != null">
+        and
+        <foreach collection="smallCapacityId" item="item" open="(" separator="," close=")">
+          "smallCapacityId" in  #{item}
+        </foreach>
+      </if>
+      <if test="smallCapacityWeight != null">
+        and
+        <foreach collection="smallCapacityWeight" item="item" open="(" separator="," close=")">
+          "smallCapacityWeight" in  #{item}
+        </foreach>
+      </if>
+      <if test="bargeRefuteTime != null">
+        and
+        <foreach collection="bargeRefuteTime" item="item" open="(" separator="," close=")">
+          "bargeRefuteTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+        </foreach>
+      </if>
+      <if test="bargeRefuteLocation != null">
+        and
+        <foreach collection="bargeRefuteLocation" item="item" open="(" separator="," close=")">
+          "bargeRefuteLocation" in  #{item}
+        </foreach>
+      </if>
+      <if test="bargeBackTime != null">
+        and
+        <foreach collection="bargeBackTime" item="item" open="(" separator="," close=")">
+          "bargeBackTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+        </foreach>
+      </if>
+      <if test="bargeBackLocation != null">
+        and
+        <foreach collection="bargeBackLocation" item="item" open="(" separator="," close=")">
+          "bargeBackLocation" in  #{item}
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByInsertTime"></include>
+  </select>
+
+  <select id="selectBargeOperation" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT
+    SMALL_CAPACITY_ID "smallCapacityId",
+    BARGE_SMALLSHIP_LOAD_WEIGHT "bargeSmallshipLoadWeight",
+    BARGE_REFUTE_DATE "bargeRefuteDate",
+    BARGE_REFUTE_LOCATION "bargeRefuteLocation",
+    BARGE_BACK_DATE "bargeBackDate",
+    BARGE_BACK_LOCATION "bargeBackLocation"
+    FROM TMSSHIP_BARGE_OPERATION
+    WHERE BARGE_OPERATION_ID = #{bargeOperationId}
+  </select>
+</mapper>

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

@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipEntryWharyResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipEntryWharyResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
+    <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber" />
+    <result column="WHARY_ID" jdbcType="DECIMAL" property="wharyId" />
+    <result column="RESULT_PORT_DECLARATION_TIME" jdbcType="TIMESTAMP" property="resultPortDeclarationTime" />
+    <result column="RESULT_PORT_DECLARATION_NAME" jdbcType="VARCHAR" property="resultPortDeclarationName" />
+    <result column="RESULT_ARRIVAL_TIME" jdbcType="TIMESTAMP" property="resultArrivalTime" />
+    <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, WHARY_ID, RESULT_PORT_DECLARATION_TIME, 
+    RESULT_PORT_DECLARATION_NAME, RESULT_ARRIVAL_TIME, RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_NUMBER, t.WHARY_ID, t.RESULT_PORT_DECLARATION_TIME, 
+    t.RESULT_PORT_DECLARATION_NAME, t.RESULT_ARRIVAL_TIME, t.RESULT_MEMO, t.DELETE_NAME, 
+    t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
+    t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSSHIP_ENTRY_WHARY_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSSHIP_ENTRY_WHARY_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        and RESULT_NUMBER = #{resultNumber}
+      </if>
+      <if test="wharyId != null">
+        and WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        and TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = #{resultPortDeclarationTime}
+      </if>
+      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
+        and RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName}
+      </if>
+      <if test="resultArrivalTime != null">
+        and TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = #{resultArrivalTime}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO = #{resultMemo}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        and RESULT_NUMBER LIKE '%${resultNumber}%'
+      </if>
+      <if test="wharyId != null">
+        and WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        and TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = #{resultPortDeclarationTime}
+      </if>
+      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
+        and RESULT_PORT_DECLARATION_NAME LIKE '%${resultPortDeclarationName}%'
+      </if>
+      <if test="resultArrivalTime != null">
+        and TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = #{resultArrivalTime}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO LIKE '%${resultMemo}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSSHIP_ENTRY_WHARY_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSSHIP_ENTRY_WHARY_RESULT
+    where 1!=1 
+      <if test="totalResultId != null">
+        or TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        or RESULT_NUMBER = #{resultNumber}
+      </if>
+      <if test="wharyId != null">
+        or WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        or TO_CHAR(RESULT_PORT_DECLARATION_TIME,'yyyy-MM-dd') = '#{resultPortDeclarationTime}'
+      </if>
+      <if test="resultPortDeclarationName != null and resultPortDeclarationName != ''">
+        or RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName}
+      </if>
+      <if test="resultArrivalTime != null">
+        or TO_CHAR(RESULT_ARRIVAL_TIME,'yyyy-MM-dd') = '#{resultArrivalTime}'
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        or RESULT_MEMO = #{resultMemo}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        or DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        or DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipEntryWharyResult">
+    insert into TMSSHIP_ENTRY_WHARY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, 
+      WHARY_ID, RESULT_PORT_DECLARATION_TIME, RESULT_PORT_DECLARATION_NAME, 
+      RESULT_ARRIVAL_TIME, RESULT_MEMO, DELETE_NAME, 
+      DELETE_TIME, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, 
+      #{wharyId,jdbcType=DECIMAL}, #{resultPortDeclarationTime,jdbcType=TIMESTAMP}, #{resultPortDeclarationName,jdbcType=VARCHAR}, 
+      #{resultArrivalTime,jdbcType=TIMESTAMP}, #{resultMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, 
+      #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipEntryWharyResult">
+    insert into TMSSHIP_ENTRY_WHARY_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID,
+      </if>
+      <if test="resultNumber != null">
+        RESULT_NUMBER,
+      </if>
+      <if test="wharyId != null">
+        WHARY_ID,
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        RESULT_PORT_DECLARATION_TIME,
+      </if>
+      <if test="resultPortDeclarationName != null">
+        RESULT_PORT_DECLARATION_NAME,
+      </if>
+      <if test="resultArrivalTime != null">
+        RESULT_ARRIVAL_TIME,
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="totalResultId != null">
+        #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNumber != null">
+        #{resultNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="wharyId != null">
+        #{wharyId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultPortDeclarationName != null">
+        #{resultPortDeclarationName,jdbcType=VARCHAR},
+      </if>
+      <if test="resultArrivalTime != null">
+        #{resultArrivalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultMemo != null">
+        #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipEntryWharyResult">
+    update TMSSHIP_ENTRY_WHARY_RESULT
+    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+      WHARY_ID = #{wharyId,jdbcType=DECIMAL},
+      RESULT_PORT_DECLARATION_TIME = #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
+      RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName,jdbcType=VARCHAR},
+      RESULT_ARRIVAL_TIME = #{resultArrivalTime,jdbcType=TIMESTAMP},
+      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipEntryWharyResult">
+    update TMSSHIP_ENTRY_WHARY_RESULT
+    <set>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNumber != null">
+        RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="wharyId != null">
+        WHARY_ID = #{wharyId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPortDeclarationTime != null">
+        RESULT_PORT_DECLARATION_TIME = #{resultPortDeclarationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultPortDeclarationName != null">
+        RESULT_PORT_DECLARATION_NAME = #{resultPortDeclarationName,jdbcType=VARCHAR},
+      </if>
+      <if test="resultArrivalTime != null">
+        RESULT_ARRIVAL_TIME = #{resultArrivalTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSSHIP_ENTRY_WHARY_RESULT 
+      (RESULT_ID, 
+      TOTAL_RESULT_ID, RESULT_NUMBER, 
+      WHARY_ID, RESULT_PORT_DECLARATION_TIME, 
+      RESULT_PORT_DECLARATION_NAME, RESULT_ARRIVAL_TIME, 
+      RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR}, 
+      #{item.wharyId,jdbcType=DECIMAL}, #{item.resultPortDeclarationTime,jdbcType=TIMESTAMP}, 
+      #{item.resultPortDeclarationName,jdbcType=VARCHAR}, #{item.resultArrivalTime,jdbcType=TIMESTAMP}, 
+      #{item.resultMemo,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSSHIP_ENTRY_WHARY_RESULT
+     set
+       RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,TOTAL_RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,WHARY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.wharyId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_PORT_DECLARATION_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPortDeclarationTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_PORT_DECLARATION_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPortDeclarationName,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_ARRIVAL_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where RESULT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSSHIP_ENTRY_WHARY_RESULT
+    where RESULT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectMaxId" resultType="DECIMAL" >
+    SELECT MAX(RESULT_ID)+1 FROM TMSSHIP_ENTRY_WHARY_RESULT
+  </select>
+</mapper>

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

@@ -0,0 +1,848 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipLoadShipResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipLoadShipResult">
+        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
+        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
+        <result column="LOCATION_START_PORT_ID" jdbcType="DECIMAL" property="locationStartPortId"/>
+        <result column="ARRIVAL_PORT_ID" jdbcType="DECIMAL" property="arrivalPortId"/>
+        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
+        <result column="RESULT_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultDeliveryDate"/>
+        <result column="RESULT_ACTUAL_INSTALLATIONS" jdbcType="DECIMAL" property="resultActualInstallations"/>
+        <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber"/>
+        <result column="RWAREHOUSE_MATERIAL_ID" jdbcType="DECIMAL" property="rwarehouseMaterialId"/>
+        <result column="RESULT_ARRIVAL_PORT_TIME" jdbcType="TIMESTAMP" property="resultArrivalPortTime"/>
+        <result column="RESULT_OUT_PORT_TIME" jdbcType="TIMESTAMP" property="resultOutPortTime"/>
+        <result column="RESULT_LOAD_SHIP_DATE" jdbcType="TIMESTAMP" property="resultLoadShipDate"/>
+        <result column="RESULT_ISCLEAR" jdbcType="VARCHAR" property="resultIsclear"/>
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
+        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID, ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+    RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER, RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
+    RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE, RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.RESULT_ID, t.TOTAL_RESULT_ID, t.LOCATION_START_PORT_ID, t.ARRIVAL_PORT_ID, t.BATCH_ID,
+    t.RESULT_DELIVERY_DATE, t.RESULT_ACTUAL_INSTALLATIONS, t.RESULT_NUMBER, t.RWAREHOUSE_MATERIAL_ID,
+    t.RESULT_ARRIVAL_PORT_TIME, t.RESULT_OUT_PORT_TIME, t.RESULT_LOAD_SHIP_DATE, t.RESULT_ISCLEAR,
+    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM TMSSHIP_LOAD_SHIP_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSSHIP_LOAD_SHIP_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="locationStartPortId != null">
+                and LOCATION_START_PORT_ID = #{locationStartPortId}
+            </if>
+            <if test="arrivalPortId != null">
+                and ARRIVAL_PORT_ID = #{arrivalPortId}
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="resultDeliveryDate != null">
+                and TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = #{resultDeliveryDate}
+            </if>
+            <if test="resultActualInstallations != null">
+                and RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
+            </if>
+            <if test="resultNumber != null and resultNumber != ''">
+                and RESULT_NUMBER = #{resultNumber}
+            </if>
+            <if test="rwarehouseMaterialId != null">
+                and RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
+            </if>
+            <if test="resultArrivalPortTime != null">
+                and TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = #{resultArrivalPortTime}
+            </if>
+            <if test="resultOutPortTime != null">
+                and TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = #{resultOutPortTime}
+            </if>
+            <if test="resultLoadShipDate != null">
+                and TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = #{resultLoadShipDate}
+            </if>
+            <if test="resultIsclear != null and resultIsclear != ''">
+                and RESULT_ISCLEAR = #{resultIsclear}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME = #{deleteName}
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME = #{deleteTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="locationStartPortId != null">
+                and LOCATION_START_PORT_ID = #{locationStartPortId}
+            </if>
+            <if test="arrivalPortId != null">
+                and ARRIVAL_PORT_ID = #{arrivalPortId}
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="resultDeliveryDate != null">
+                and TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = #{resultDeliveryDate}
+            </if>
+            <if test="resultActualInstallations != null">
+                and RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
+            </if>
+            <if test="resultNumber != null and resultNumber != ''">
+                and RESULT_NUMBER LIKE '%${resultNumber}%'
+            </if>
+            <if test="rwarehouseMaterialId != null">
+                and RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
+            </if>
+            <if test="resultArrivalPortTime != null">
+                and TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = #{resultArrivalPortTime}
+            </if>
+            <if test="resultOutPortTime != null">
+                and TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = #{resultOutPortTime}
+            </if>
+            <if test="resultLoadShipDate != null">
+                and TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = #{resultLoadShipDate}
+            </if>
+            <if test="resultIsclear != null and resultIsclear != ''">
+                and RESULT_ISCLEAR LIKE '%${resultIsclear}%'
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME LIKE '%${deleteName}%'
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME LIKE '%${deleteTime}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from TMSSHIP_LOAD_SHIP_RESULT
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSSHIP_LOAD_SHIP_RESULT
+        where 1!=1
+        <if test="totalResultId != null">
+            or TOTAL_RESULT_ID = #{totalResultId}
+        </if>
+        <if test="locationStartPortId != null">
+            or LOCATION_START_PORT_ID = #{locationStartPortId}
+        </if>
+        <if test="arrivalPortId != null">
+            or ARRIVAL_PORT_ID = #{arrivalPortId}
+        </if>
+        <if test="batchId != null">
+            or BATCH_ID = #{batchId}
+        </if>
+        <if test="resultDeliveryDate != null">
+            or TO_CHAR(RESULT_DELIVERY_DATE,'yyyy-MM-dd') = '#{resultDeliveryDate}'
+        </if>
+        <if test="resultActualInstallations != null">
+            or RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations}
+        </if>
+        <if test="resultNumber != null and resultNumber != ''">
+            or RESULT_NUMBER = #{resultNumber}
+        </if>
+        <if test="rwarehouseMaterialId != null">
+            or RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId}
+        </if>
+        <if test="resultArrivalPortTime != null">
+            or TO_CHAR(RESULT_ARRIVAL_PORT_TIME,'yyyy-MM-dd') = '#{resultArrivalPortTime}'
+        </if>
+        <if test="resultOutPortTime != null">
+            or TO_CHAR(RESULT_OUT_PORT_TIME,'yyyy-MM-dd') = '#{resultOutPortTime}'
+        </if>
+        <if test="resultLoadShipDate != null">
+            or TO_CHAR(RESULT_LOAD_SHIP_DATE,'yyyy-MM-dd') = '#{resultLoadShipDate}'
+        </if>
+        <if test="resultIsclear != null and resultIsclear != ''">
+            or RESULT_ISCLEAR = #{resultIsclear}
+        </if>
+        <if test="deleteName != null and deleteName != ''">
+            or DELETE_NAME = #{deleteName}
+        </if>
+        <if test="deleteTime != null and deleteTime != ''">
+            or DELETE_TIME = #{deleteTime}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
+        insert into TMSSHIP_LOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
+                                              ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+                                              RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
+                                              RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
+                                              RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
+                                              RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
+                                              INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                              UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
+        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
+                #{locationStartPortId,jdbcType=DECIMAL},
+                #{arrivalPortId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL},
+                #{resultDeliveryDate,jdbcType=TIMESTAMP},
+                #{resultActualInstallations,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR},
+                #{rwarehouseMaterialId,jdbcType=DECIMAL}, #{resultArrivalPortTime,jdbcType=TIMESTAMP},
+                #{resultOutPortTime,jdbcType=TIMESTAMP}, #{resultLoadShipDate,jdbcType=TIMESTAMP},
+                #{resultIsclear,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
+        insert into TMSSHIP_LOAD_SHIP_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                RESULT_ID,
+            </if>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID,
+            </if>
+            <if test="locationStartPortId != null">
+                LOCATION_START_PORT_ID,
+            </if>
+            <if test="arrivalPortId != null">
+                ARRIVAL_PORT_ID,
+            </if>
+            <if test="batchId != null">
+                BATCH_ID,
+            </if>
+            <if test="resultDeliveryDate != null">
+                RESULT_DELIVERY_DATE,
+            </if>
+            <if test="resultActualInstallations != null">
+                RESULT_ACTUAL_INSTALLATIONS,
+            </if>
+            <if test="resultNumber != null">
+                RESULT_NUMBER,
+            </if>
+            <if test="rwarehouseMaterialId != null">
+                RWAREHOUSE_MATERIAL_ID,
+            </if>
+            <if test="resultArrivalPortTime != null">
+                RESULT_ARRIVAL_PORT_TIME,
+            </if>
+            <if test="resultOutPortTime != null">
+                RESULT_OUT_PORT_TIME,
+            </if>
+            <if test="resultLoadShipDate != null">
+                RESULT_LOAD_SHIP_DATE,
+            </if>
+            <if test="resultIsclear != null">
+                RESULT_ISCLEAR,
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME,
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                #{resultId,jdbcType=DECIMAL},
+            </if>
+            <if test="totalResultId != null">
+                #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="locationStartPortId != null">
+                #{locationStartPortId,jdbcType=DECIMAL},
+            </if>
+            <if test="arrivalPortId != null">
+                #{arrivalPortId,jdbcType=DECIMAL},
+            </if>
+            <if test="batchId != null">
+                #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultDeliveryDate != null">
+                #{resultDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultActualInstallations != null">
+                #{resultActualInstallations,jdbcType=DECIMAL},
+            </if>
+            <if test="resultNumber != null">
+                #{resultNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="rwarehouseMaterialId != null">
+                #{rwarehouseMaterialId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultArrivalPortTime != null">
+                #{resultArrivalPortTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultOutPortTime != null">
+                #{resultOutPortTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultLoadShipDate != null">
+                #{resultLoadShipDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultIsclear != null">
+                #{resultIsclear,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
+        update TMSSHIP_LOAD_SHIP_RESULT
+        set TOTAL_RESULT_ID             = #{totalResultId,jdbcType=DECIMAL},
+            LOCATION_START_PORT_ID      = #{locationStartPortId,jdbcType=DECIMAL},
+            ARRIVAL_PORT_ID             = #{arrivalPortId,jdbcType=DECIMAL},
+            BATCH_ID                    = #{batchId,jdbcType=DECIMAL},
+            RESULT_DELIVERY_DATE        = #{resultDeliveryDate,jdbcType=TIMESTAMP},
+            RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations,jdbcType=DECIMAL},
+            RESULT_NUMBER               = #{resultNumber,jdbcType=VARCHAR},
+            RWAREHOUSE_MATERIAL_ID      = #{rwarehouseMaterialId,jdbcType=DECIMAL},
+            RESULT_ARRIVAL_PORT_TIME    = #{resultArrivalPortTime,jdbcType=TIMESTAMP},
+            RESULT_OUT_PORT_TIME        = #{resultOutPortTime,jdbcType=TIMESTAMP},
+            RESULT_LOAD_SHIP_DATE       = #{resultLoadShipDate,jdbcType=TIMESTAMP},
+            RESULT_ISCLEAR              = #{resultIsclear,jdbcType=VARCHAR},
+            DELETE_NAME                 = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME                 = #{deleteTime,jdbcType=VARCHAR},
+            INSERT_USERNAME             = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                 = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME             = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                 = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK        = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED                     = #{deleted,jdbcType=DECIMAL}
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipLoadShipResult">
+        update TMSSHIP_LOAD_SHIP_RESULT
+        <set>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="locationStartPortId != null">
+                LOCATION_START_PORT_ID = #{locationStartPortId,jdbcType=DECIMAL},
+            </if>
+            <if test="arrivalPortId != null">
+                ARRIVAL_PORT_ID = #{arrivalPortId,jdbcType=DECIMAL},
+            </if>
+            <if test="batchId != null">
+                BATCH_ID = #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultDeliveryDate != null">
+                RESULT_DELIVERY_DATE = #{resultDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultActualInstallations != null">
+                RESULT_ACTUAL_INSTALLATIONS = #{resultActualInstallations,jdbcType=DECIMAL},
+            </if>
+            <if test="resultNumber != null">
+                RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="rwarehouseMaterialId != null">
+                RWAREHOUSE_MATERIAL_ID = #{rwarehouseMaterialId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultArrivalPortTime != null">
+                RESULT_ARRIVAL_PORT_TIME = #{resultArrivalPortTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultOutPortTime != null">
+                RESULT_OUT_PORT_TIME = #{resultOutPortTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultLoadShipDate != null">
+                RESULT_LOAD_SHIP_DATE = #{resultLoadShipDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultIsclear != null">
+                RESULT_ISCLEAR = #{resultIsclear,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSSHIP_LOAD_SHIP_RESULT
+        (RESULT_ID,
+        TOTAL_RESULT_ID, LOCATION_START_PORT_ID,
+        ARRIVAL_PORT_ID, BATCH_ID, RESULT_DELIVERY_DATE,
+        RESULT_ACTUAL_INSTALLATIONS, RESULT_NUMBER,
+        RWAREHOUSE_MATERIAL_ID, RESULT_ARRIVAL_PORT_TIME,
+        RESULT_OUT_PORT_TIME, RESULT_LOAD_SHIP_DATE,
+        RESULT_ISCLEAR, DELETE_NAME, DELETE_TIME,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.resultId,jdbcType=DECIMAL},
+        #{item.totalResultId,jdbcType=DECIMAL}, #{item.locationStartPortId,jdbcType=DECIMAL},
+        #{item.arrivalPortId,jdbcType=DECIMAL}, #{item.batchId,jdbcType=DECIMAL},
+        #{item.resultDeliveryDate,jdbcType=TIMESTAMP},
+        #{item.resultActualInstallations,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR},
+        #{item.rwarehouseMaterialId,jdbcType=DECIMAL}, #{item.resultArrivalPortTime,jdbcType=TIMESTAMP},
+        #{item.resultOutPortTime,jdbcType=TIMESTAMP}, #{item.resultLoadShipDate,jdbcType=TIMESTAMP},
+        #{item.resultIsclear,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR},
+        #{item.deleteTime,jdbcType=VARCHAR},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update TMSSHIP_LOAD_SHIP_RESULT
+        set
+        RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+        ,TOTAL_RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+        </foreach>
+        ,LOCATION_START_PORT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.locationStartPortId,jdbcType=DECIMAL}
+        </foreach>
+        ,ARRIVAL_PORT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.arrivalPortId,jdbcType=DECIMAL}
+        </foreach>
+        ,BATCH_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_DELIVERY_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDeliveryDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_ACTUAL_INSTALLATIONS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultActualInstallations,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,RWAREHOUSE_MATERIAL_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.rwarehouseMaterialId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_ARRIVAL_PORT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalPortTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_OUT_PORT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutPortTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_LOAD_SHIP_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultLoadShipDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_ISCLEAR=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsclear,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where RESULT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSSHIP_LOAD_SHIP_RESULT
+        where RESULT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(RESULT_ID) + 1
+        FROM TMSSHIP_LOAD_SHIP_RESULT
+    </select>
+    <!--查询所有装船信息-->
+    <sql id="orderByInsertTime">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+    <select id="selectLoadShipList" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT DISTINCT ttr.ORDER_ID as "orderId",
+        tlsr.INSERT_TIME as "insertTime",
+        tlsr.RESULT_ID as "resultId",
+        rp.PORT_NAME as "noticePort",
+        adn.NOTICE_DELIVERY_TIME as "noticeTime",
+        rm.MATERIAL_NAME as "materialName",
+        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+        actr.RESULT_NUMBER_OF_LOANS as "amount",
+        rrmr.GM_TONNAGE as "portAmount",
+        rc.CAPACITY_NUMBER as "capacityName",
+        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
+        tsl.LOCATION_VALUE as "nowLocation",
+        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+        tlsr.RESULT_ARRIVAL_PORT_TIME as "arriveTime",
+        tlsr.RESULT_OUT_PORT_TIME as "liveTime",
+        rps.PORT_NAME as "startPortName",
+        rpe.PORT_NAME as "arrivePortName",
+        tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
+        tlsr.RESULT_ISCLEAR as "isClear",
+        tlsr.INSERT_UPDATE_REMARK as "memo"
+        FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        LEFT JOIN DIL_BATCH db
+        ON tlsr.BATCH_ID = db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON db.MATERIAL_ID = rm.MATERIAL_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        ON ada.BATCH_ID = osi.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
+        ON ada.BATCH_ID = adn.BATCH_ID
+        LEFT JOIN RMS_PORT rp
+        ON rp.PORT_ID = adn.PORT_ID
+        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
+        ON adn.BATCH_ID = actr.BATCH_ID
+        LEFT JOIN WMSH_GRID_MATERIAL rrmr
+        ON tlsr.RWAREHOUSE_MATERIAL_ID = rrmr.GM_ID
+        LEFT JOIN TMSSHIP_SHIP_LOCATION tsl
+        ON ttr.RESULT_ID = tsl.TOTAL_RESULT_ID
+        LEFT JOIN RMS_PORT rps
+        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+        LEFT JOIN RMS_PORT rpe
+        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+        WHERE tlsr.DELETED = 0)
+        <where>
+            <if test="noticePort != null">
+                and
+                <foreach collection="noticePort" item="item" open="(" separator="," close=")">
+                    "noticePort" in #{item}
+                </foreach>
+            </if>
+            <if test="noticeTime != null">
+                and
+                <foreach collection="noticeTime" item="item" open="(" separator="," close=")">
+                    "noticeTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="foreignShipName != null">
+                and
+                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+                    "foreignShipName" in #{item}
+                </foreach>
+            </if>
+            <if test="amount != null">
+                and
+                <foreach collection="amount" item="item" open="(" separator="," close=")">
+                    "amount" in #{item}
+                </foreach>
+            </if>
+            <if test="portAmount != null">
+                and
+                <foreach collection="portAmount" item="item" open="(" separator="," close=")">
+                    "portAmount" in #{item}
+                </foreach>
+            </if>
+            <if test="capacityName != null">
+                and
+                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+                    "capacityName" in #{item}
+                </foreach>
+            </if>
+            <if test="planWeight != null">
+                and
+                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
+                    "planWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="nowLocation != null">
+                and
+                <foreach collection="nowLocation" item="item" open="(" separator="," close=")">
+                    "nowLocation" in #{item}
+                </foreach>
+            </if>
+            <if test="realWeight != null">
+                and
+                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
+                    "realWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="arriveTime != null">
+                and
+                <foreach collection="arriveTime" item="item" open="(" separator="," close=")">
+                    "arriveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="liveTime != null">
+                and
+                <foreach collection="liveTime" item="item" open="(" separator="," close=")">
+                    "liveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="startPortName != null">
+                and
+                <foreach collection="startPortName" item="item" open="(" separator="," close=")">
+                    "startPortName" in #{item}
+                </foreach>
+            </if>
+            <if test="arrivePortName != null">
+                and
+                <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
+                    "arrivePortName" in #{item}
+                </foreach>
+            </if>
+            <if test="loadTime != null">
+                and
+                <foreach collection="loadTime" item="item" open="(" separator="," close=")">
+                    "loadTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="isClear != null">
+                and
+                <foreach collection="isClear" item="item" open="(" separator="," close=")">
+                    "isClear" in #{item}
+                </foreach>
+            </if>
+            <if test="memo != null">
+                and
+                <foreach collection="memo" item="item" open="(" separator="," close=")">
+                    "memo" in #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <select id="selectAllWeight" resultType="DECIMAL" parameterType="DECIMAL">
+        select SUM(t_loadShip.RESULT_ACTUAL_INSTALLATIONS) "sumWeight"
+        from OMSSHIP_INSTRUCTIONS_CAPACITY oi_capacity
+                 left join TMSSHIP_TOTAL_RESULT t_total
+                           on oi_capacity.INSTRUCTIONS_CAPACITY_ID = t_total.ORDER_ID
+                 left join TMSSHIP_LOAD_SHIP_RESULT t_loadShip
+                           on t_total.RESULT_ID = t_loadShip.TOTAL_RESULT_ID
+        where oi_capacity.INSTRUCTIONS_ID = #{instructionsId}
+    </select>
+
+    <select id="selectLoadShip" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT LOCATION_START_PORT_ID      "locationStartPortId",
+               ARRIVAL_PORT_ID             "arrivalPortId",
+               BATCH_ID                    "batchId",
+               RESULT_DELIVERY_DATE        "resultDeliveryDate",
+               RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
+               RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
+               RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
+               RESULT_OUT_PORT_TIME        "resultOutPortTime",
+               RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
+               RESULT_ISCLEAR              "resultIsClear"
+        FROM TMSSHIP_LOAD_SHIP_RESULT
+        WHERE RESULT_ID = #{resultId}
+    </select>
+
+  <!-- 通过外轮船名和物资名称得到批次id -->
+    <select id="getBatchId" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT BATCH_ID
+        FROM DIL_BATCH db
+                 LEFT JOIN RMS_MATERIAL rm
+                           ON rm.MATERIAL_ID = db.MATERIAL_ID
+        WHERE rm.MATERIAL_NAME = #{materialName}
+          AND db.RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
+    </select>
+</mapper>

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

@@ -0,0 +1,450 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipOutWharyResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipOutWharyResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
+    <result column="RESULT_NUMBER" jdbcType="VARCHAR" property="resultNumber" />
+    <result column="WHARY_ID" jdbcType="DECIMAL" property="wharyId" />
+    <result column="RESULT_OUT_WHARY_TIME" jdbcType="TIMESTAMP" property="resultOutWharyTime" />
+    <result column="RESULT_OUT_WHARY_NAME" jdbcType="VARCHAR" property="resultOutWharyName" />
+    <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, WHARY_ID, RESULT_OUT_WHARY_TIME, RESULT_OUT_WHARY_NAME, 
+    RESULT_MEMO, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_NUMBER, t.WHARY_ID, t.RESULT_OUT_WHARY_TIME, 
+    t.RESULT_OUT_WHARY_NAME, t.RESULT_MEMO, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSSHIP_OUT_WHARY_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSSHIP_OUT_WHARY_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        and RESULT_NUMBER = #{resultNumber}
+      </if>
+      <if test="wharyId != null">
+        and WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultOutWharyTime != null">
+        and TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = #{resultOutWharyTime}
+      </if>
+      <if test="resultOutWharyName != null and resultOutWharyName != ''">
+        and RESULT_OUT_WHARY_NAME = #{resultOutWharyName}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO = #{resultMemo}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        and RESULT_NUMBER LIKE '%${resultNumber}%'
+      </if>
+      <if test="wharyId != null">
+        and WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultOutWharyTime != null">
+        and TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = #{resultOutWharyTime}
+      </if>
+      <if test="resultOutWharyName != null and resultOutWharyName != ''">
+        and RESULT_OUT_WHARY_NAME LIKE '%${resultOutWharyName}%'
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO LIKE '%${resultMemo}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSSHIP_OUT_WHARY_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSSHIP_OUT_WHARY_RESULT
+    where 1!=1 
+      <if test="totalResultId != null">
+        or TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="resultNumber != null and resultNumber != ''">
+        or RESULT_NUMBER = #{resultNumber}
+      </if>
+      <if test="wharyId != null">
+        or WHARY_ID = #{wharyId}
+      </if>
+      <if test="resultOutWharyTime != null">
+        or TO_CHAR(RESULT_OUT_WHARY_TIME,'yyyy-MM-dd') = '#{resultOutWharyTime}'
+      </if>
+      <if test="resultOutWharyName != null and resultOutWharyName != ''">
+        or RESULT_OUT_WHARY_NAME = #{resultOutWharyName}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        or RESULT_MEMO = #{resultMemo}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        or DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        or DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipOutWharyResult">
+    insert into TMSSHIP_OUT_WHARY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_NUMBER, 
+      WHARY_ID, RESULT_OUT_WHARY_TIME, RESULT_OUT_WHARY_NAME, 
+      RESULT_MEMO, DELETE_NAME, DELETE_TIME, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultNumber,jdbcType=VARCHAR}, 
+      #{wharyId,jdbcType=DECIMAL}, #{resultOutWharyTime,jdbcType=TIMESTAMP}, #{resultOutWharyName,jdbcType=VARCHAR}, 
+      #{resultMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipOutWharyResult">
+    insert into TMSSHIP_OUT_WHARY_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID,
+      </if>
+      <if test="resultNumber != null">
+        RESULT_NUMBER,
+      </if>
+      <if test="wharyId != null">
+        WHARY_ID,
+      </if>
+      <if test="resultOutWharyTime != null">
+        RESULT_OUT_WHARY_TIME,
+      </if>
+      <if test="resultOutWharyName != null">
+        RESULT_OUT_WHARY_NAME,
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="totalResultId != null">
+        #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNumber != null">
+        #{resultNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="wharyId != null">
+        #{wharyId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultOutWharyTime != null">
+        #{resultOutWharyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultOutWharyName != null">
+        #{resultOutWharyName,jdbcType=VARCHAR},
+      </if>
+      <if test="resultMemo != null">
+        #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipOutWharyResult">
+    update TMSSHIP_OUT_WHARY_RESULT
+    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+      WHARY_ID = #{wharyId,jdbcType=DECIMAL},
+      RESULT_OUT_WHARY_TIME = #{resultOutWharyTime,jdbcType=TIMESTAMP},
+      RESULT_OUT_WHARY_NAME = #{resultOutWharyName,jdbcType=VARCHAR},
+      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipOutWharyResult">
+    update TMSSHIP_OUT_WHARY_RESULT
+    <set>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultNumber != null">
+        RESULT_NUMBER = #{resultNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="wharyId != null">
+        WHARY_ID = #{wharyId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultOutWharyTime != null">
+        RESULT_OUT_WHARY_TIME = #{resultOutWharyTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultOutWharyName != null">
+        RESULT_OUT_WHARY_NAME = #{resultOutWharyName,jdbcType=VARCHAR},
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSSHIP_OUT_WHARY_RESULT 
+      (RESULT_ID, 
+      TOTAL_RESULT_ID, RESULT_NUMBER, 
+      WHARY_ID, RESULT_OUT_WHARY_TIME, 
+      RESULT_OUT_WHARY_NAME, RESULT_MEMO, 
+      DELETE_NAME, DELETE_TIME, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultNumber,jdbcType=VARCHAR}, 
+      #{item.wharyId,jdbcType=DECIMAL}, #{item.resultOutWharyTime,jdbcType=TIMESTAMP}, 
+      #{item.resultOutWharyName,jdbcType=VARCHAR}, #{item.resultMemo,jdbcType=VARCHAR}, 
+      #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSSHIP_OUT_WHARY_RESULT
+     set
+       RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,TOTAL_RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_NUMBER=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,WHARY_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.wharyId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_OUT_WHARY_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutWharyTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_OUT_WHARY_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutWharyName,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where RESULT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSSHIP_OUT_WHARY_RESULT
+    where RESULT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectMaxId" resultType="DECIMAL" >
+    SELECT MAX(RESULT_ID)+1 FROM TMSSHIP_OUT_WHARY_RESULT
+  </select>
+</mapper>

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

@@ -0,0 +1,578 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipShipLocationMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipShipLocation">
+    <id column="LOCATION_ID" jdbcType="DECIMAL" property="locationId" />
+    <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
+    <result column="LOCATION_VALUE" jdbcType="VARCHAR" property="locationValue" />
+    <result column="LOCATION_ROUTE_TIME" jdbcType="TIMESTAMP" property="locationRouteTime" />
+    <result column="LOCATION_MEMO" jdbcType="VARCHAR" property="locationMemo" />
+    <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="LOCATION_STATUS" jdbcType="VARCHAR" property="locationStatus" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+  </resultMap>
+  <sql id="columns">
+    LOCATION_ID, TOTAL_RESULT_ID, LOCATION_VALUE, LOCATION_ROUTE_TIME, LOCATION_MEMO,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, LOCATION_STATUS, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.LOCATION_ID, t.TOTAL_RESULT_ID, t.LOCATION_VALUE, t.LOCATION_ROUTE_TIME, t.LOCATION_MEMO,
+    t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.LOCATION_STATUS, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSSHIP_SHIP_LOCATION
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSSHIP_SHIP_LOCATION t
+  </sql>
+  <sql id="where">
+    <where>
+      <if test="locationId != null">
+        and LOCATION_ID = #{locationId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="locationValue != null and locationValue != ''">
+        and LOCATION_VALUE = #{locationValue}
+      </if>
+      <if test="locationRouteTime != null">
+        and TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = #{locationRouteTime}
+      </if>
+      <if test="locationMemo != null and locationMemo != ''">
+        and LOCATION_MEMO = #{locationMemo}
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME = #{deleteTime}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="locationStatus != null and locationStatus != ''">
+        and LOCATION_STATUS = #{locationStatus}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where>
+      <if test="locationId != null">
+        and LOCATION_ID = #{locationId}
+      </if>
+      <if test="totalResultId != null">
+        and TOTAL_RESULT_ID = #{totalResultId}
+      </if>
+      <if test="locationValue != null and locationValue != ''">
+        and LOCATION_VALUE LIKE '%${locationValue}%'
+      </if>
+      <if test="locationRouteTime != null">
+        and TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = #{locationRouteTime}
+      </if>
+      <if test="locationMemo != null and locationMemo != ''">
+        and LOCATION_MEMO LIKE '%${locationMemo}%'
+      </if>
+      <if test="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null and deleteTime != ''">
+        and DELETE_TIME LIKE '%${deleteTime}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="locationStatus != null and locationStatus != ''">
+        and LOCATION_STATUS LIKE '%${locationStatus}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSSHIP_SHIP_LOCATION
+    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSSHIP_SHIP_LOCATION
+    where 1!=1
+    <if test="totalResultId != null">
+      or TOTAL_RESULT_ID = #{totalResultId}
+    </if>
+    <if test="locationValue != null and locationValue != ''">
+      or LOCATION_VALUE = #{locationValue}
+    </if>
+    <if test="locationRouteTime != null">
+      or TO_CHAR(LOCATION_ROUTE_TIME,'yyyy-MM-dd') = '#{locationRouteTime}'
+    </if>
+    <if test="locationMemo != null and locationMemo != ''">
+      or LOCATION_MEMO = #{locationMemo}
+    </if>
+    <if test="deleteName != null and deleteName != ''">
+      or DELETE_NAME = #{deleteName}
+    </if>
+    <if test="deleteTime != null and deleteTime != ''">
+      or DELETE_TIME = #{deleteTime}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="locationStatus != null and locationStatus != ''">
+      or LOCATION_STATUS = #{locationStatus}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
+    insert into TMSSHIP_SHIP_LOCATION (LOCATION_ID, TOTAL_RESULT_ID, LOCATION_VALUE,
+      LOCATION_ROUTE_TIME, LOCATION_MEMO, DELETE_NAME,
+      DELETE_TIME, INSERT_USERNAME, INSERT_TIME,
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+      LOCATION_STATUS, DELETED)
+    values (#{locationId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{locationValue,jdbcType=VARCHAR},
+      #{locationRouteTime,jdbcType=TIMESTAMP}, #{locationMemo,jdbcType=VARCHAR}, #{deleteName,jdbcType=VARCHAR},
+      #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+      #{locationStatus,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
+    insert into TMSSHIP_SHIP_LOCATION
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="locationId != null">
+        LOCATION_ID,
+      </if>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID,
+      </if>
+      <if test="locationValue != null">
+        LOCATION_VALUE,
+      </if>
+      <if test="locationRouteTime != null">
+        LOCATION_ROUTE_TIME,
+      </if>
+      <if test="locationMemo != null">
+        LOCATION_MEMO,
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="locationStatus != null">
+        LOCATION_STATUS,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="locationId != null">
+        #{locationId,jdbcType=DECIMAL},
+      </if>
+      <if test="totalResultId != null">
+        #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="locationValue != null">
+        #{locationValue,jdbcType=VARCHAR},
+      </if>
+      <if test="locationRouteTime != null">
+        #{locationRouteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="locationMemo != null">
+        #{locationMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="locationStatus != null">
+        #{locationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
+    update TMSSHIP_SHIP_LOCATION
+    set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      LOCATION_VALUE = #{locationValue,jdbcType=VARCHAR},
+      LOCATION_ROUTE_TIME = #{locationRouteTime,jdbcType=TIMESTAMP},
+      LOCATION_MEMO = #{locationMemo,jdbcType=VARCHAR},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      LOCATION_STATUS = #{locationStatus,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipShipLocation">
+    update TMSSHIP_SHIP_LOCATION
+    <set>
+      <if test="totalResultId != null">
+        TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="locationValue != null">
+        LOCATION_VALUE = #{locationValue,jdbcType=VARCHAR},
+      </if>
+      <if test="locationRouteTime != null">
+        LOCATION_ROUTE_TIME = #{locationRouteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="locationMemo != null">
+        LOCATION_MEMO = #{locationMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="locationStatus != null">
+        LOCATION_STATUS = #{locationStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where LOCATION_ID = #{locationId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="where"/>
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    <include refid="whereLike"/>
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into TMSSHIP_SHIP_LOCATION
+    (LOCATION_ID,
+    TOTAL_RESULT_ID, LOCATION_VALUE,
+    LOCATION_ROUTE_TIME, LOCATION_MEMO,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    LOCATION_STATUS, DELETED)
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.locationId,jdbcType=DECIMAL},
+    #{item.totalResultId,jdbcType=DECIMAL}, #{item.locationValue,jdbcType=VARCHAR},
+    #{item.locationRouteTime,jdbcType=TIMESTAMP}, #{item.locationMemo,jdbcType=VARCHAR},
+    #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+    #{item.locationStatus,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+  </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+    update TMSSHIP_SHIP_LOCATION
+    set
+    LOCATION_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationId,jdbcType=DECIMAL}
+    </foreach>
+    ,TOTAL_RESULT_ID=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+    </foreach>
+    ,LOCATION_VALUE=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationValue,jdbcType=VARCHAR}
+    </foreach>
+    ,LOCATION_ROUTE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationRouteTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,LOCATION_MEMO=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationMemo,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_NAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,LOCATION_STATUS=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.locationStatus,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach collection="list" item="item" index="index" separator=" " open="case LOCATION_ID" close="end">
+      when #{item.locationId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    where LOCATION_ID in
+    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+      #{item.locationId,jdbcType=DECIMAL}
+    </foreach>
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSSHIP_SHIP_LOCATION
+    where LOCATION_ID in
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="selectMaxId" resultType="DECIMAL">
+    SELECT MAX(LOCATION_ID)+1 FROM TMSSHIP_SHIP_LOCATION
+  </select>
+
+  <!--查询所有船舶位置信息-->
+  <sql id="orderByInsertTime">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+  </sql>
+  <select id="selectShipLocationList" resultType="java.util.Map">
+    SELECT * FROM (
+    SELECT DISTINCT ttr.ORDER_ID as "orderId",
+    tsl.INSERT_TIME as "insertTime",
+    tsl.LOCATION_ID as "locationId",
+    rm.MATERIAL_NAME as "materialName",
+    db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+    rc.CAPACITY_NUMBER as "capacityName",
+    rps.PORT_NAME as "startPortName",
+    rpe.PORT_NAME as "arrivePortName",
+    oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
+    tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+    tsl.LOCATION_VALUE as "shipLocation",
+    tsl.LOCATION_STATUS as "locationStatus",
+    tsl.LOCATION_ROUTE_TIME as "locationRouteTime",
+    tsl.LOCATION_MEMO as "locationMemo"
+    FROM TMSSHIP_SHIP_LOCATION tsl
+    LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+    ON tsl.TOTAL_RESULT_ID = ttr.RESULT_ID
+    LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+    ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+    LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+    ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+    LEFT JOIN DIL_BATCH db
+    ON osi.BATCH_ID = db.BATCH_ID
+    LEFT JOIN RMS_MATERIAL rm
+    ON db.MATERIAL_ID = rm.MATERIAL_ID
+    LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+    ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+    LEFT JOIN RMS_PORT rps
+    ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+    LEFT JOIN RMS_PORT rpe
+    ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+    LEFT JOIN RMS_CAPACITY rc
+    ON rc.CAPACITY_ID = oic.CAPACITY_ID
+    WHERE tsl.DELETED = 0)
+    <where>
+
+      <if test="materialName != null">
+        and
+        <foreach collection="materialName" item="item" open="(" separator="," close=")">
+          "materialName" in  #{item}
+        </foreach>
+      </if>
+      <if test="foreignShipName != null">
+        and
+        <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+          "foreignShipName" in  #{item}
+        </foreach>
+      </if>
+      <if test="capacityName != null">
+        and
+        <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+          "capacityName" in  #{item}
+        </foreach>
+      </if>
+      <if test="startPortName != null">
+        and
+        <foreach collection="startPortName" item="item" open="(" separator="," close=")">
+          "startPortName" in  #{item}
+        </foreach>
+      </if>
+      <if test="arrivePortName != null">
+        and
+        <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
+          "arrivePortName" in  #{item}
+        </foreach>
+      </if>
+      <if test="planWeight != null">
+        and
+        <foreach collection="planWeight" item="item" open="(" separator="," close=")">
+          "planWeight" in #{item}
+        </foreach>
+      </if>
+      <if test="realWeight != null">
+        and
+        <foreach collection="realWeight" item="item" open="(" separator="," close=")">
+          "realWeight" in  #{item}
+        </foreach>
+      </if>
+      <if test="shipLocation != null">
+        and
+        <foreach collection="shipLocation" item="item" open="(" separator="," close=")">
+          "shipLocation" in  #{item}
+        </foreach>
+      </if>
+      <if test="locationStatus != null">
+        and
+        <foreach collection="locationStatus" item="item" open="(" separator="," close=")">
+          "locationStatus" in  #{item}
+        </foreach>
+      </if>
+      <if test="locationRouteTime != null">
+        and
+        <foreach collection="locationRouteTime" item="item" open="(" separator="," close=")">
+          "locationRouteTime" in  to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+        </foreach>
+      </if>
+      <if test="locationMemo != null">
+        and
+        <foreach collection="locationMemo" item="item" open="(" separator="," close=")">
+          "locationMemo" in  #{item}
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByInsertTime"></include>
+  </select>
+
+  <select id="selectShipLocation" parameterType="DECIMAL" resultType="java.util.Map">
+    SELECT
+    LOCATION_VALUE "locationValue",
+    LOCATION_ROUTE_TIME "locationRouteTime",
+    LOCATION_STATUS "locationStatus",
+    LOCATION_MEMO "locationMemo"
+    FROM TMSSHIP_SHIP_LOCATION
+    WHERE LOCATION_ID = #{locationId}
+  </select>
+</mapper>

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

@@ -0,0 +1,547 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipTotalResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipTotalResult">
+        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
+        <result column="ORDER_ID" jdbcType="DECIMAL" property="orderId"/>
+        <result column="RESULT_DURATION" jdbcType="DECIMAL" property="resultDuration"/>
+        <result column="STANDARD_DATA_ID" jdbcType="DECIMAL" property="standardDataId"/>
+        <result column="RESULT_OUTLIER" jdbcType="DECIMAL" property="resultOutlier"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+    </resultMap>
+    <sql id="columns">
+        RESULT_ID, ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="columns_alias">
+        t.RESULT_ID, t.ORDER_ID, t.RESULT_DURATION, t.STANDARD_DATA_ID, t.RESULT_OUTLIER,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM TMSSHIP_TOTAL_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSSHIP_TOTAL_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="resultDuration != null">
+                and RESULT_DURATION = #{resultDuration}
+            </if>
+            <if test="standardDataId != null">
+                and STANDARD_DATA_ID = #{standardDataId}
+            </if>
+            <if test="resultOutlier != null">
+                and RESULT_OUTLIER = #{resultOutlier}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="resultDuration != null">
+                and RESULT_DURATION = #{resultDuration}
+            </if>
+            <if test="standardDataId != null">
+                and STANDARD_DATA_ID = #{standardDataId}
+            </if>
+            <if test="resultOutlier != null">
+                and RESULT_OUTLIER = #{resultOutlier}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from TMSSHIP_TOTAL_RESULT
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSSHIP_TOTAL_RESULT
+        where 1!=1
+        <if test="orderId != null">
+            or ORDER_ID = #{orderId}
+        </if>
+        <if test="resultDuration != null">
+            or RESULT_DURATION = #{resultDuration}
+        </if>
+        <if test="standardDataId != null">
+            or STANDARD_DATA_ID = #{standardDataId}
+        </if>
+        <if test="resultOutlier != null">
+            or RESULT_OUTLIER = #{resultOutlier}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
+        insert into TMSSHIP_TOTAL_RESULT (RESULT_ID, ORDER_ID, RESULT_DURATION,
+                                          STANDARD_DATA_ID, RESULT_OUTLIER, INSERT_USERNAME,
+                                          INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                          INSERT_UPDATE_REMARK)
+        values (#{resultId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{resultDuration,jdbcType=DECIMAL},
+                #{standardDataId,jdbcType=DECIMAL}, #{resultOutlier,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
+        insert into TMSSHIP_TOTAL_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                RESULT_ID,
+            </if>
+            <if test="orderId != null">
+                ORDER_ID,
+            </if>
+            <if test="resultDuration != null">
+                RESULT_DURATION,
+            </if>
+            <if test="standardDataId != null">
+                STANDARD_DATA_ID,
+            </if>
+            <if test="resultOutlier != null">
+                RESULT_OUTLIER,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                #{resultId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderId != null">
+                #{orderId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultDuration != null">
+                #{resultDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="standardDataId != null">
+                #{standardDataId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultOutlier != null">
+                #{resultOutlier,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
+        update TMSSHIP_TOTAL_RESULT
+        set ORDER_ID             = #{orderId,jdbcType=DECIMAL},
+            RESULT_DURATION      = #{resultDuration,jdbcType=DECIMAL},
+            STANDARD_DATA_ID     = #{standardDataId,jdbcType=DECIMAL},
+            RESULT_OUTLIER       = #{resultOutlier,jdbcType=DECIMAL},
+            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR}
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipTotalResult">
+        update TMSSHIP_TOTAL_RESULT
+        <set>
+            <if test="orderId != null">
+                ORDER_ID = #{orderId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultDuration != null">
+                RESULT_DURATION = #{resultDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="standardDataId != null">
+                STANDARD_DATA_ID = #{standardDataId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultOutlier != null">
+                RESULT_OUTLIER = #{resultOutlier,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSSHIP_TOTAL_RESULT
+        (RESULT_ID,
+        ORDER_ID, RESULT_DURATION, STANDARD_DATA_ID,
+        RESULT_OUTLIER, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.resultId,jdbcType=DECIMAL},
+        #{item.orderId,jdbcType=DECIMAL}, #{item.resultDuration,jdbcType=DECIMAL},
+        #{item.standardDataId,jdbcType=DECIMAL},
+        #{item.resultOutlier,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update TMSSHIP_TOTAL_RESULT
+        set
+        RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_DURATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultDuration,jdbcType=DECIMAL}
+        </foreach>
+        ,STANDARD_DATA_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.standardDataId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_OUTLIER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultOutlier,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where RESULT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSSHIP_TOTAL_RESULT
+        where RESULT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(RESULT_ID) + 1
+        FROM TMSSHIP_TOTAL_RESULT
+    </select>
+
+    <select id="selectResultTotalId" resultType="DECIMAL">
+        SELECT RESULT_ID
+        FROM TMSSHIP_TOTAL_RESULT
+        WHERE ORDER_ID = #{orderId}
+    </select>
+
+    <sql id="orderByInsertTime">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+    <select id="selectOrderList" resultType="java.util.Map">
+        select * from (
+        SELECT DISTINCT ttr.ORDER_ID as "orderId",
+        ttr.INSERT_TIME as "insertTime",
+        rm.MATERIAL_NAME as "materialName",
+        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+        rc.CAPACITY_NUMBER as "capacityName",
+        rsh.SHIPPER_ABBREVIATION as "shipperAbbreviation",
+        rsu.SUPPLIER_ABBREVIATION as "supplierAbbreviation",
+        pier.PIER_NAME as "groupName",
+        tlsr.RESULT_LOAD_SHIP_DATE as "resultLoadShipDate",
+        rps.PORT_NAME as "startPortName",
+        rpe.PORT_NAME as "arrivePortName",
+        tlsr.RESULT_ARRIVAL_PORT_TIME as "arriveTime",
+        tlsr.RESULT_OUT_PORT_TIME as "liveTime",
+        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
+        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+        tlsr.INSERT_UPDATE_REMARK as "resultMemo"
+        FROM TMSSHIP_TOTAL_RESULT ttr
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH db
+        ON osi.BATCH_ID = db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON db.MATERIAL_ID = rm.MATERIAL_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
+        on osi.BATCH_ID = ada.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
+        on adn.BATCH_ID = ada.BATCH_ID
+        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
+        ON actr.BATCH_ID = adn.BATCH_ID
+        LEFT JOIN RMS_SHIPPER rsh
+        ON adn.REQUESTER_GROUP_ID = rsh.SHIPPER_ID
+        LEFT JOIN RMS_SUPPLIER rsu
+        ON adn.CARRIER_ID = rsu.SUPPLIER_ID
+        LEFT JOIN RMS_PIER pier
+        ON pier.PIER_ID = actr.GROUP_ID
+        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN RMS_PORT rps
+        ON tlsr.LOCATION_START_PORT_ID = rps.PORT_ID
+        LEFT JOIN RMS_PORT rpe
+        ON tlsr.ARRIVAL_PORT_ID = rpe.PORT_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        )
+        <where>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="foreignShipName != null">
+                and
+                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+                    "foreignShipName" in #{item}
+                </foreach>
+            </if>
+            <if test="capacityName != null">
+                and
+                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+                    "capacityName" in #{item}
+                </foreach>
+            </if>
+            <if test="shipperAbbreviation != null">
+                and
+                <foreach collection="shipperAbbreviation" item="item" open="(" separator="," close=")">
+                    "shipperAbbreviation" in #{item}
+                </foreach>
+            </if>
+            <if test="supplierAbbreviation != null">
+                and
+                <foreach collection="supplierAbbreviation" item="item" open="(" separator="," close=")">
+                    "supplierAbbreviation" in #{item}
+                </foreach>
+            </if>
+            <if test="groupName != null">
+                and
+                <foreach collection="groupName" item="item" open="(" separator="," close=")">
+                    "groupName" in #{item}
+                </foreach>
+            </if>
+            <if test="resultLoadShipDate != null">
+                and
+                <foreach collection="resultLoadShipDate" item="item" open="(" separator="," close=")">
+                    "resultLoadShipDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="startPortName != null">
+                and
+                <foreach collection="startPortName" item="item" open="(" separator="," close=")">
+                    "startPortName" in #{item}
+                </foreach>
+            </if>
+            <if test="arrivePortName != null">
+                and
+                <foreach collection="arrivePortName" item="item" open="(" separator="," close=")">
+                    "arrivePortName" in #{item}
+                </foreach>
+            </if>
+            <if test="arriveTime != null">
+                and
+                <foreach collection="arriveTime" item="item" open="(" separator="," close=")">
+                    "arriveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="liveTime != null">
+                and
+                <foreach collection="liveTime" item="item" open="(" separator="," close=")">
+                    "liveTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="planWeight != null">
+                and
+                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
+                    "planWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="realWeight != null">
+                and
+                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
+                    "realWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="resultMemo != null">
+                and
+                <foreach collection="resultMemo" item="item" open="(" separator="," close=")">
+                    "resultMemo" in #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <select id="getCapacity" resultType="java.util.Map">
+        SELECT * FROM(
+        SELECT db.RESULT_FOREIGN_SHIP_NAME as "resultForeignShipName",
+        rm.MATERIAL_NAME as "materialName",
+        rc.CAPACITY_NUMBER as "capacityNumber",
+        oic.INSTRUCTIONS_CAPACITY_ID as "orderId"
+        FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH db
+        ON db.BATCH_ID = osi.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON rm.MATERIAL_ID = db.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        )
+        <where>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="," close=")">
+                    "resultForeignShipName" in #{item}
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="," close=")">
+                    "capacityNumber" in #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

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

@@ -0,0 +1,562 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipUnloadShipResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipUnloadShipResult">
+        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
+        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
+        <result column="RESULT_ARRIVAL_DATE" jdbcType="TIMESTAMP" property="resultArrivalDate"/>
+        <result column="RESULT_START_TIME" jdbcType="TIMESTAMP" property="resultStartTime"/>
+        <result column="RESULT_END_TIME" jdbcType="TIMESTAMP" property="resultEndTime"/>
+        <result column="RESULT_STATUS" jdbcType="VARCHAR" property="resultStatus"/>
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
+        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        RESULT_ID, TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE, RESULT_START_TIME, RESULT_END_TIME,
+    RESULT_STATUS, DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_ARRIVAL_DATE, t.RESULT_START_TIME, t.RESULT_END_TIME,
+    t.RESULT_STATUS, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME, t.INSERT_TIME,
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM TMSSHIP_UNLOAD_SHIP_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSSHIP_UNLOAD_SHIP_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="resultArrivalDate != null">
+                and TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = #{resultArrivalDate}
+            </if>
+            <if test="resultStartTime != null">
+                and TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = #{resultStartTime}
+            </if>
+            <if test="resultEndTime != null">
+                and TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = #{resultEndTime}
+            </if>
+            <if test="resultStatus != null and resultStatus != ''">
+                and RESULT_STATUS = #{resultStatus}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME = #{deleteName}
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME = #{deleteTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="resultArrivalDate != null">
+                and TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = #{resultArrivalDate}
+            </if>
+            <if test="resultStartTime != null">
+                and TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = #{resultStartTime}
+            </if>
+            <if test="resultEndTime != null">
+                and TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = #{resultEndTime}
+            </if>
+            <if test="resultStatus != null and resultStatus != ''">
+                and RESULT_STATUS LIKE '%${resultStatus}%'
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME LIKE '%${deleteName}%'
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME LIKE '%${deleteTime}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from TMSSHIP_UNLOAD_SHIP_RESULT
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSSHIP_UNLOAD_SHIP_RESULT
+        where 1!=1
+        <if test="totalResultId != null">
+            or TOTAL_RESULT_ID = #{totalResultId}
+        </if>
+        <if test="resultArrivalDate != null">
+            or TO_CHAR(RESULT_ARRIVAL_DATE,'yyyy-MM-dd') = '#{resultArrivalDate}'
+        </if>
+        <if test="resultStartTime != null">
+            or TO_CHAR(RESULT_START_TIME,'yyyy-MM-dd') = '#{resultStartTime}'
+        </if>
+        <if test="resultEndTime != null">
+            or TO_CHAR(RESULT_END_TIME,'yyyy-MM-dd') = '#{resultEndTime}'
+        </if>
+        <if test="resultStatus != null and resultStatus != ''">
+            or RESULT_STATUS = #{resultStatus}
+        </if>
+        <if test="deleteName != null and deleteName != ''">
+            or DELETE_NAME = #{deleteName}
+        </if>
+        <if test="deleteTime != null and deleteTime != ''">
+            or DELETE_TIME = #{deleteTime}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipUnloadShipResult">
+        insert into TMSSHIP_UNLOAD_SHIP_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE,
+                                                RESULT_START_TIME, RESULT_END_TIME, RESULT_STATUS,
+                                                DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+                                                INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                                INSERT_UPDATE_REMARK, DELETED)
+        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
+                #{resultArrivalDate,jdbcType=TIMESTAMP},
+                #{resultStartTime,jdbcType=TIMESTAMP}, #{resultEndTime,jdbcType=TIMESTAMP},
+                #{resultStatus,jdbcType=VARCHAR},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipUnloadShipResult">
+        insert into TMSSHIP_UNLOAD_SHIP_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                RESULT_ID,
+            </if>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID,
+            </if>
+            <if test="resultArrivalDate != null">
+                RESULT_ARRIVAL_DATE,
+            </if>
+            <if test="resultStartTime != null">
+                RESULT_START_TIME,
+            </if>
+            <if test="resultEndTime != null">
+                RESULT_END_TIME,
+            </if>
+            <if test="resultStatus != null">
+                RESULT_STATUS,
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME,
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                #{resultId,jdbcType=DECIMAL},
+            </if>
+            <if test="totalResultId != null">
+                #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultArrivalDate != null">
+                #{resultArrivalDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultStartTime != null">
+                #{resultStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultEndTime != null">
+                #{resultEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultStatus != null">
+                #{resultStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipUnloadShipResult">
+        update TMSSHIP_UNLOAD_SHIP_RESULT
+        set TOTAL_RESULT_ID      = #{totalResultId,jdbcType=DECIMAL},
+            RESULT_ARRIVAL_DATE  = #{resultArrivalDate,jdbcType=TIMESTAMP},
+            RESULT_START_TIME    = #{resultStartTime,jdbcType=TIMESTAMP},
+            RESULT_END_TIME      = #{resultEndTime,jdbcType=TIMESTAMP},
+            RESULT_STATUS        = #{resultStatus,jdbcType=VARCHAR},
+            DELETE_NAME          = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME          = #{deleteTime,jdbcType=VARCHAR},
+            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED              = #{deleted,jdbcType=DECIMAL}
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipUnloadShipResult">
+        update TMSSHIP_UNLOAD_SHIP_RESULT
+        <set>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultArrivalDate != null">
+                RESULT_ARRIVAL_DATE = #{resultArrivalDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultStartTime != null">
+                RESULT_START_TIME = #{resultStartTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultEndTime != null">
+                RESULT_END_TIME = #{resultEndTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultStatus != null">
+                RESULT_STATUS = #{resultStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSSHIP_UNLOAD_SHIP_RESULT
+        (RESULT_ID,
+        TOTAL_RESULT_ID, RESULT_ARRIVAL_DATE,
+        RESULT_START_TIME, RESULT_END_TIME,
+        RESULT_STATUS, DELETE_NAME, DELETE_TIME,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.resultId,jdbcType=DECIMAL},
+        #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultArrivalDate,jdbcType=TIMESTAMP},
+        #{item.resultStartTime,jdbcType=TIMESTAMP}, #{item.resultEndTime,jdbcType=TIMESTAMP},
+        #{item.resultStatus,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update TMSSHIP_UNLOAD_SHIP_RESULT
+        set
+        RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+        ,TOTAL_RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_ARRIVAL_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultArrivalDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_START_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStartTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_END_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEndTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_STATUS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultStatus,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where RESULT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSSHIP_UNLOAD_SHIP_RESULT
+        where RESULT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(RESULT_ID) + 1
+        FROM TMSSHIP_UNLOAD_SHIP_RESULT
+    </select>
+
+    <!--查询所有卸船作业-->
+    <sql id="orderByInsertTime">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+    <select id="selectUnloadShipList" resultType="java.util.Map">
+        select * from (
+        SELECT DISTINCT
+        db.BATCH_ID as "batchId",
+        tlsr.ARRIVAL_PORT_ID as "portId",
+        ttr.ORDER_ID as "orderId",
+        tusr.RESULT_ID as "resultId",
+        tusr.INSERT_TIME as "insertTime",
+        rm.MATERIAL_NAME as "materialName",
+        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+        rc.CAPACITY_NUMBER as "capacityName",
+        tusr.RESULT_ARRIVAL_DATE as "arrivalTime",
+        tusr.RESULT_START_TIME as "unloadStartTime",
+        tusr.RESULT_END_TIME as "unloadEndTime",
+        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+        tusr.RESULT_STATUS as "unloadStatus"
+        FROM TMSSHIP_UNLOAD_SHIP_RESULT tusr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON tusr.TOTAL_RESULT_ID = ttr.RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH db
+        ON osi.BATCH_ID = db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON db.MATERIAL_ID = rm.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+        ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
+        WHERE tusr.DELETED = 0)
+        <where>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="foreignShipName != null">
+                and
+                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+                    "foreignShipName" in #{item}
+                </foreach>
+            </if>
+            <if test="capacityName != null">
+                and
+                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+                    "capacityName" in #{item}
+                </foreach>
+            </if>
+            <if test="arrivalTime != null">
+                and
+                <foreach collection="arrivalTime" item="item" open="(" separator="," close=")">
+                    "arrivalTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="unloadStartTime != null">
+                and
+                <foreach collection="unloadStartTime" item="item" open="(" separator="," close=")">
+                    "unloadStartTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="unloadEndTime != null">
+                and
+                <foreach collection="unloadEndTime" item="item" open="(" separator="," close=")">
+                    "unloadEndTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="realWeight != null">
+                and
+                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
+                    "realWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="unloadStatus != null">
+                and
+                <foreach collection="unloadStatus" item="item" open="(" separator="," close=")">
+                    "unloadStatus" in #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <select id="selectUnloadShip" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RESULT_ARRIVAL_DATE "resultArrivalDate",
+               RESULT_START_TIME   "resultStartTime",
+               RESULT_END_TIME     "resultEndTime",
+               RESULT_STATUS       "resultStatus"
+        FROM TMSSHIP_UNLOAD_SHIP_RESULT
+        WHERE RESULT_ID = #{resultId}
+    </select>
+</mapper>

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

@@ -0,0 +1,744 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.TmsshipWaterQualityResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipWaterQualityResult">
+        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
+        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
+        <result column="RESULT_PLANNED_DATE" jdbcType="TIMESTAMP" property="resultPlannedDate"/>
+        <result column="RESULT_CARGO_RIGHTS_DATE" jdbcType="TIMESTAMP" property="resultCargoRightsDate"/>
+        <result column="RESULT_SHIPMENT_RATIO" jdbcType="DECIMAL" property="resultShipmentRatio"/>
+        <result column="RESULT_EMPTY_HEAVY_WATER_METER" jdbcType="DECIMAL" property="resultEmptyHeavyWaterMeter"/>
+        <result column="RESULT_MOISTURE_CONTENT" jdbcType="DECIMAL" property="resultMoistureContent"/>
+        <result column="RESULT_WATER_TONNAGE" jdbcType="DECIMAL" property="resultWaterTonnage"/>
+        <result column="RESULT_INSPECTION_FEES" jdbcType="DECIMAL" property="resultInspectionFees"/>
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
+        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="RESULT_ES_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultEsDeliveryDate"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE, RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
+    RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT, RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
+    DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_PLANNED_DATE, t.RESULT_CARGO_RIGHTS_DATE,
+    t.RESULT_SHIPMENT_RATIO, t.RESULT_EMPTY_HEAVY_WATER_METER, t.RESULT_MOISTURE_CONTENT,
+    t.RESULT_WATER_TONNAGE, t.RESULT_INSPECTION_FEES, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.RESULT_ES_DELIVERY_DATE,
+    t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM TMSSHIP_WATER_QUALITY_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSSHIP_WATER_QUALITY_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="resultPlannedDate != null">
+                and TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = #{resultPlannedDate}
+            </if>
+            <if test="resultCargoRightsDate != null">
+                and TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = #{resultCargoRightsDate}
+            </if>
+            <if test="resultShipmentRatio != null">
+                and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
+            </if>
+            <if test="resultEmptyHeavyWaterMeter != null">
+                and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
+            </if>
+            <if test="resultMoistureContent != null">
+                and RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
+            </if>
+            <if test="resultWaterTonnage != null">
+                and RESULT_WATER_TONNAGE = #{resultWaterTonnage}
+            </if>
+            <if test="resultInspectionFees != null">
+                and RESULT_INSPECTION_FEES = #{resultInspectionFees}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME = #{deleteName}
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME = #{deleteTime}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="resultEsDeliveryDate != null">
+                and TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = #{resultEsDeliveryDate}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="resultId != null">
+                and RESULT_ID = #{resultId}
+            </if>
+            <if test="totalResultId != null">
+                and TOTAL_RESULT_ID = #{totalResultId}
+            </if>
+            <if test="resultPlannedDate != null">
+                and TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = #{resultPlannedDate}
+            </if>
+            <if test="resultCargoRightsDate != null">
+                and TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = #{resultCargoRightsDate}
+            </if>
+            <if test="resultShipmentRatio != null">
+                and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
+            </if>
+            <if test="resultEmptyHeavyWaterMeter != null">
+                and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
+            </if>
+            <if test="resultMoistureContent != null">
+                and RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
+            </if>
+            <if test="resultWaterTonnage != null">
+                and RESULT_WATER_TONNAGE = #{resultWaterTonnage}
+            </if>
+            <if test="resultInspectionFees != null">
+                and RESULT_INSPECTION_FEES = #{resultInspectionFees}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME LIKE '%${deleteName}%'
+            </if>
+            <if test="deleteTime != null and deleteTime != ''">
+                and DELETE_TIME LIKE '%${deleteTime}%'
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="resultEsDeliveryDate != null">
+                and TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = #{resultEsDeliveryDate}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from TMSSHIP_WATER_QUALITY_RESULT
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSSHIP_WATER_QUALITY_RESULT
+        where 1!=1
+        <if test="totalResultId != null">
+            or TOTAL_RESULT_ID = #{totalResultId}
+        </if>
+        <if test="resultPlannedDate != null">
+            or TO_CHAR(RESULT_PLANNED_DATE,'yyyy-MM-dd') = '#{resultPlannedDate}'
+        </if>
+        <if test="resultCargoRightsDate != null">
+            or TO_CHAR(RESULT_CARGO_RIGHTS_DATE,'yyyy-MM-dd') = '#{resultCargoRightsDate}'
+        </if>
+        <if test="resultShipmentRatio != null">
+            or RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
+        </if>
+        <if test="resultEmptyHeavyWaterMeter != null">
+            or RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
+        </if>
+        <if test="resultMoistureContent != null">
+            or RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
+        </if>
+        <if test="resultWaterTonnage != null">
+            or RESULT_WATER_TONNAGE = #{resultWaterTonnage}
+        </if>
+        <if test="resultInspectionFees != null">
+            or RESULT_INSPECTION_FEES = #{resultInspectionFees}
+        </if>
+        <if test="deleteName != null and deleteName != ''">
+            or DELETE_NAME = #{deleteName}
+        </if>
+        <if test="deleteTime != null and deleteTime != ''">
+            or DELETE_TIME = #{deleteTime}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="resultEsDeliveryDate != null">
+            or TO_CHAR(RESULT_ES_DELIVERY_DATE,'yyyy-MM-dd') = '#{resultEsDeliveryDate}'
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
+        insert into TMSSHIP_WATER_QUALITY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
+                                                  RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
+                                                  RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT,
+                                                  RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
+                                                  DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                                  INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE,
+                                                  DELETED)
+        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
+                #{resultPlannedDate,jdbcType=TIMESTAMP},
+                #{resultCargoRightsDate,jdbcType=TIMESTAMP}, #{resultShipmentRatio,jdbcType=DECIMAL},
+                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{resultMoistureContent,jdbcType=DECIMAL},
+                #{resultWaterTonnage,jdbcType=DECIMAL}, #{resultInspectionFees,jdbcType=DECIMAL},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
+                #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
+        insert into TMSSHIP_WATER_QUALITY_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                RESULT_ID,
+            </if>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID,
+            </if>
+            <if test="resultPlannedDate != null">
+                RESULT_PLANNED_DATE,
+            </if>
+            <if test="resultCargoRightsDate != null">
+                RESULT_CARGO_RIGHTS_DATE,
+            </if>
+            <if test="resultShipmentRatio != null">
+                RESULT_SHIPMENT_RATIO,
+            </if>
+            <if test="resultEmptyHeavyWaterMeter != null">
+                RESULT_EMPTY_HEAVY_WATER_METER,
+            </if>
+            <if test="resultMoistureContent != null">
+                RESULT_MOISTURE_CONTENT,
+            </if>
+            <if test="resultWaterTonnage != null">
+                RESULT_WATER_TONNAGE,
+            </if>
+            <if test="resultInspectionFees != null">
+                RESULT_INSPECTION_FEES,
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME,
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="resultEsDeliveryDate != null">
+                RESULT_ES_DELIVERY_DATE,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="resultId != null">
+                #{resultId,jdbcType=DECIMAL},
+            </if>
+            <if test="totalResultId != null">
+                #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultPlannedDate != null">
+                #{resultPlannedDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultCargoRightsDate != null">
+                #{resultCargoRightsDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultShipmentRatio != null">
+                #{resultShipmentRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="resultEmptyHeavyWaterMeter != null">
+                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
+            </if>
+            <if test="resultMoistureContent != null">
+                #{resultMoistureContent,jdbcType=DECIMAL},
+            </if>
+            <if test="resultWaterTonnage != null">
+                #{resultWaterTonnage,jdbcType=DECIMAL},
+            </if>
+            <if test="resultInspectionFees != null">
+                #{resultInspectionFees,jdbcType=DECIMAL},
+            </if>
+            <if test="deleteName != null">
+                #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="resultEsDeliveryDate != null">
+                #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
+        update TMSSHIP_WATER_QUALITY_RESULT
+        set TOTAL_RESULT_ID                = #{totalResultId,jdbcType=DECIMAL},
+            RESULT_PLANNED_DATE            = #{resultPlannedDate,jdbcType=TIMESTAMP},
+            RESULT_CARGO_RIGHTS_DATE       = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
+            RESULT_SHIPMENT_RATIO          = #{resultShipmentRatio,jdbcType=DECIMAL},
+            RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
+            RESULT_MOISTURE_CONTENT        = #{resultMoistureContent,jdbcType=DECIMAL},
+            RESULT_WATER_TONNAGE           = #{resultWaterTonnage,jdbcType=DECIMAL},
+            RESULT_INSPECTION_FEES         = #{resultInspectionFees,jdbcType=DECIMAL},
+            DELETE_NAME                    = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME                    = #{deleteTime,jdbcType=VARCHAR},
+            INSERT_USERNAME                = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                    = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME                = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                    = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK           = #{insertUpdateRemark,jdbcType=VARCHAR},
+            RESULT_ES_DELIVERY_DATE        = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
+            DELETED                        = #{deleted,jdbcType=DECIMAL}
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
+        update TMSSHIP_WATER_QUALITY_RESULT
+        <set>
+            <if test="totalResultId != null">
+                TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultPlannedDate != null">
+                RESULT_PLANNED_DATE = #{resultPlannedDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultCargoRightsDate != null">
+                RESULT_CARGO_RIGHTS_DATE = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultShipmentRatio != null">
+                RESULT_SHIPMENT_RATIO = #{resultShipmentRatio,jdbcType=DECIMAL},
+            </if>
+            <if test="resultEmptyHeavyWaterMeter != null">
+                RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
+            </if>
+            <if test="resultMoistureContent != null">
+                RESULT_MOISTURE_CONTENT = #{resultMoistureContent,jdbcType=DECIMAL},
+            </if>
+            <if test="resultWaterTonnage != null">
+                RESULT_WATER_TONNAGE = #{resultWaterTonnage,jdbcType=DECIMAL},
+            </if>
+            <if test="resultInspectionFees != null">
+                RESULT_INSPECTION_FEES = #{resultInspectionFees,jdbcType=DECIMAL},
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="resultEsDeliveryDate != null">
+                RESULT_ES_DELIVERY_DATE = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSSHIP_WATER_QUALITY_RESULT
+        (RESULT_ID,
+        TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
+        RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
+        RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT,
+        RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
+        DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        RESULT_ES_DELIVERY_DATE, DELETED
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.resultId,jdbcType=DECIMAL},
+        #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultPlannedDate,jdbcType=TIMESTAMP},
+        #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}, #{item.resultShipmentRatio,jdbcType=DECIMAL},
+        #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{item.resultMoistureContent,jdbcType=DECIMAL},
+        #{item.resultWaterTonnage,jdbcType=DECIMAL}, #{item.resultInspectionFees,jdbcType=DECIMAL},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR},
+        #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update TMSSHIP_WATER_QUALITY_RESULT
+        set
+        RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+        ,TOTAL_RESULT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_PLANNED_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPlannedDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_CARGO_RIGHTS_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_SHIPMENT_RATIO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultShipmentRatio,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_EMPTY_HEAVY_WATER_METER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_MOISTURE_CONTENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMoistureContent,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_WATER_TONNAGE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultWaterTonnage,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_INSPECTION_FEES=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultInspectionFees,jdbcType=DECIMAL}
+        </foreach>
+        ,DELETE_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,RESULT_ES_DELIVERY_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where RESULT_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.resultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSSHIP_WATER_QUALITY_RESULT
+        where RESULT_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+    <select id="selectMaxId" resultType="DECIMAL">
+        SELECT MAX(RESULT_ID) + 1
+        FROM TMSSHIP_WATER_QUALITY_RESULT
+    </select>
+
+    <!--查询所有水分质检作业-->
+    <sql id="orderByInsertTime">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </sql>
+    <select id="selectWaterQualityList" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT DISTINCT ttr.ORDER_ID as "orderId",
+        twqr.INSERT_TIME as "insertTime",
+        twqr.RESULT_ID as "resultId",
+        rm.MATERIAL_NAME as "materialName",
+        db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
+        rpo.PORT_NAME as "loadPort",
+        twqr.RESULT_PLANNED_DATE as "planDate",
+        twqr.RESULT_ES_DELIVERY_DATE as "expectNoticeDate",
+        twqr.RESULT_CARGO_RIGHTS_DATE as "cargoDate",
+        adn.PURCHASE_CONTRACT_MOISTURE as "purchaseContractMoisture",
+        tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
+        oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
+        rc.CAPACITY_NUMBER as "capacityName",
+        tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
+        twqr.RESULT_EMPTY_HEAVY_WATER_METER as "waterGauge",
+        twqr.RESULT_MOISTURE_CONTENT as "moistureContent",
+        twqr.RESULT_WATER_TONNAGE as "waterWeight",
+        twqr.RESULT_INSPECTION_FEES as "testFee",
+        twqr.RESULT_SHIPMENT_RATIO as "loadRatio"
+        FROM TMSSHIP_WATER_QUALITY_RESULT twqr
+        LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
+        ON twqr.TOTAL_RESULT_ID = ttr.RESULT_ID
+        LEFT JOIN OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        ON oic.INSTRUCTIONS_CAPACITY_ID = ttr.ORDER_ID
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
+        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH db
+        ON osi.BATCH_ID = db.BATCH_ID
+        LEFT JOIN RMS_MATERIAL rm
+        ON db.MATERIAL_ID = rm.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT tlsr
+        ON ttr.RESULT_ID = tlsr.TOTAL_RESULT_ID
+        LEFT JOIN RMS_PORT rpo
+        ON tlsr.ARRIVAL_PORT_ID = rpo.PORT_ID
+        LEFT JOIN AMSSHIP_DELIVERY_NOTICE adn
+        ON adn.BATCH_ID = db.BATCH_ID
+        WHERE twqr.DELETED = 0)
+        <where>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="foreignShipName != null">
+                and
+                <foreach collection="foreignShipName" item="item" open="(" separator="," close=")">
+                    "foreignShipName" in #{item}
+                </foreach>
+            </if>
+            <if test="loadPort != null">
+                and
+                <foreach collection="loadPort" item="item" open="(" separator="," close=")">
+                    "loadPort" in #{item}
+                </foreach>
+            </if>
+            <if test="planDate != null">
+                and
+                <foreach collection="planDate" item="item" open="(" separator="," close=")">
+                    "planDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="expectNoticeDate != null">
+                and
+                <foreach collection="expectNoticeDate" item="item" open="(" separator="," close=")">
+                    "expectNoticeDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="cargoDate != null">
+                and
+                <foreach collection="cargoDate" item="item" open="(" separator="," close=")">
+                    "cargoDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="purchaseContractMoisture != null">
+                and
+                <foreach collection="purchaseContractMoisture" item="item" open="(" separator="," close=")">
+                    "purchaseContractMoisture" in #{item}
+                </foreach>
+            </if>
+            <if test="loadTime != null">
+                and
+                <foreach collection="loadTime" item="item" open="(" separator="," close=")">
+                    "loadTime" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="planWeight != null">
+                and
+                <foreach collection="planWeight" item="item" open="(" separator="," close=")">
+                    "planWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="capacityName != null">
+                and
+                <foreach collection="capacityName" item="item" open="(" separator="," close=")">
+                    "capacityName" in #{item}
+                </foreach>
+            </if>
+            <if test="realWeight != null">
+                and
+                <foreach collection="realWeight" item="item" open="(" separator="," close=")">
+                    "realWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="waterGauge != null">
+                and
+                <foreach collection="waterGauge" item="item" open="(" separator="," close=")">
+                    "waterGauge" in #{item}
+                </foreach>
+            </if>
+            <if test="moistureContent != null">
+                and
+                <foreach collection="moistureContent" item="item" open="(" separator="," close=")">
+                    "moistureContent" in #{item}
+                </foreach>
+            </if>
+            <if test="waterWeight != null">
+                and
+                <foreach collection="waterWeight" item="item" open="(" separator="," close=")">
+                    "waterWeight" in #{item}
+                </foreach>
+            </if>
+            <if test="testFee != null">
+                and
+                <foreach collection="testFee" item="item" open="(" separator="," close=")">
+                    "testFee" in #{item}
+                </foreach>
+            </if>
+            <if test="loadRatio != null">
+                and
+                <foreach collection="loadRatio" item="item" open="(" separator="," close=")">
+                    "loadRatio" in #{item}
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByInsertTime"></include>
+    </select>
+
+    <select id="selectWaterQuality" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RESULT_PLANNED_DATE            "resultPlannedDate",
+               RESULT_CARGO_RIGHTS_DATE       "resultCargoRightsDate",
+               RESULT_EMPTY_HEAVY_WATER_METER "resultEmptyHeavyWaterMeter",
+               RESULT_WATER_TONNAGE           "resultWaterTonnage",
+               RESULT_INSPECTION_FEES         "resultInspectionFees",
+               RESULT_ES_DELIVERY_DATE        "resultEsDeliveryDate"
+        FROM TMSSHIP_WATER_QUALITY_RESULT
+        WHERE RESULT_ID = #{resultId}
+    </select>
+
+    <select id="selectRealWeight" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT RESULT_ACTUAL_INSTALLATIONS
+        FROM TMSSHIP_LOAD_SHIP_RESULT
+        WHERE TOTAL_RESULT_ID = #{totalResultId}
+    </select>
+
+    <select id="selectInstructionsId" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT INSTRUCTIONS_ID
+        FROM OMSSHIP_INSTRUCTIONS_CAPACITY
+        WHERE INSTRUCTIONS_CAPACITY_ID = #{orderId}
+    </select>
+</mapper>

src/main/resources/log4j.properties

@@ -0,0 +1,80 @@
+## LOG4J配置
+log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+## 控制台输出
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+## root日志输出到文件
+log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.file.file=/logsdata/logs/springboot-log4j-root.log
+log4j.appender.file.DatePattern='.'yyyy-MM-dd
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+## 按不同package进行输出
+## com.steer包下的日志配置
+log4j.category.market=DEBUG, steerfile
+log4j.category.com.hnshituo=DEBUG, steerfile
+#log4j.category.com.steer=${logging.level.com.steer}, steerfile
+log4j.category.com.steer=DEBUG, steerfile
+# com.steer下的日志输出
+log4j.appender.steerfile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.steerfile.file=/logsdata/logs/springboot-log4j-steer.log
+log4j.appender.steerfile.DatePattern='.'yyyy-MM-dd
+log4j.appender.steerfile.layout=org.apache.log4j.PatternLayout
+#log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
+log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+
+## ERROR级别输出到特定的日志文件中
+log4j.logger.error=errorfile
+## 异常日志####
+log4j.appender.errorfile=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.errorfile.file=/logs/exception/exc.log
+log4j.appender.errorfile.DatePattern='.'yyyy-MM-dd
+log4j.appender.errorfile.Threshold = ERROR
+log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
+#log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
+log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+### 运行日志 ###
+log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.RUNNING.File =/logs/log/running.log
+log4j.appender.RUNNING.Append = true
+log4j.appender.RUNNING.Threshold = INFO
+log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
+log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
+log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+
+### 指定类###
+log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
+## 调试日志 ###
+log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DEB.File = /logs/debug/debug.log
+log4j.appender.DEB.Append = true
+log4j.appender.DEB.Threshold = DEBUG 
+log4j.appender.DEB.DatePattern='.'yyyy-MM-dd
+log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
+log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+####[%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n
+
+#### 业务日志###
+log4j.logger.com.steer.rbac.sysoperlog.service.BizLogRecord = INFO,BIZ
+log4j.appender.BIZ = org.apache.log4j.DailyRollingFileAppender
+log4j.appender.BIZ.File = /logs/business/biz.log
+log4j.appender.BIZ.Append = true
+log4j.appender.BIZ.Threshold = INFO
+log4j.appender.BIZ.DatePattern='.'yyyy-MM-dd
+log4j.appender.BIZ.layout = org.apache.log4j.PatternLayout
+log4j.appender.BIZ.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
+#
+#
+#### 资源日志###
+#log4j.appender.ENV = org.apache.log4j.DailyRollingFileAppender
+#log4j.appender.ENV.File = ../logs/env/env.log
+#log4j.appender.ENV.Append = true
+#log4j.appender.ENV.Threshold = INFO
+#log4j.appender.ENV.DatePattern='.'yyyy-MM-dd
+#1420.3og4j.appender.ENV.layout = org.apache.log4j.PatternLayout
+#log4j.appender.ENV.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n

src/main/resources/message.properties

@@ -0,0 +1,4 @@
+succeed=操作成功
+failed=操作失败
+unreg=帐号或手机号码未注册
+passerr=密码错误