Browse Source

first commit

HUJIANGUO 3 years ago
commit
7781e27669
60 changed files with 8130 additions and 0 deletions
  1. 8 0
      .gitignore
  2. 152 0
      pom.xml
  3. 26 0
      src/main/java/com/steerinfo/DilApplicationMain.java
  4. 22 0
      src/main/java/com/steerinfo/dil/config/CorsConfig1.java
  5. 43 0
      src/main/java/com/steerinfo/dil/config/WebSocketConfig.java
  6. 41 0
      src/main/java/com/steerinfo/dil/controller/AmsPurchaseOrderController.java
  7. 78 0
      src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java
  8. 78 0
      src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java
  9. 78 0
      src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java
  10. 40 0
      src/main/java/com/steerinfo/dil/controller/TmstruckMeasureCommissionController.java
  11. 38 0
      src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java
  12. 19 0
      src/main/java/com/steerinfo/dil/feign/ColumnDataFeign.java
  13. 26 0
      src/main/java/com/steerinfo/dil/interceptors/MyLocaleChangeInterceptor.java
  14. 25 0
      src/main/java/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.java
  15. 23 0
      src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java
  16. 16 0
      src/main/java/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.java
  17. 23 0
      src/main/java/com/steerinfo/dil/mapper/RmsPersonnelMapper.java
  18. 23 0
      src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.java
  19. 16 0
      src/main/java/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.java
  20. 21 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.java
  21. 17 0
      src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java
  22. 274 0
      src/main/java/com/steerinfo/dil/model/AmsPurchaseOrder.java
  23. 259 0
      src/main/java/com/steerinfo/dil/model/RmsMaterial.java
  24. 184 0
      src/main/java/com/steerinfo/dil/model/RmsMaterialType.java
  25. 259 0
      src/main/java/com/steerinfo/dil/model/RmsPersonnel.java
  26. 499 0
      src/main/java/com/steerinfo/dil/model/RmsSupplier.java
  27. 136 0
      src/main/java/com/steerinfo/dil/model/RmsUnitOfMeasure.java
  28. 153 0
      src/main/java/com/steerinfo/dil/model/TmstruckMeasureCommission.java
  29. 289 0
      src/main/java/com/steerinfo/dil/model/TmstruckWeightResult.java
  30. 26 0
      src/main/java/com/steerinfo/dil/service/IAmsPurchaseOrderService.java
  31. 24 0
      src/main/java/com/steerinfo/dil/service/IRmsMaterialService.java
  32. 29 0
      src/main/java/com/steerinfo/dil/service/IRmsPersonnelService.java
  33. 34 0
      src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java
  34. 31 0
      src/main/java/com/steerinfo/dil/service/ITmstruckMeasureCommissionService.java
  35. 30 0
      src/main/java/com/steerinfo/dil/service/ITmstruckWeightResultService.java
  36. 107 0
      src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java
  37. 126 0
      src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java
  38. 91 0
      src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.java
  39. 108 0
      src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java
  40. 53 0
      src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java
  41. 69 0
      src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java
  42. 70 0
      src/main/java/com/steerinfo/dil/util/BaseRESTfulController.java
  43. 38 0
      src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java
  44. 192 0
      src/main/java/com/steerinfo/dil/util/DataConversionTool.java
  45. 33 0
      src/main/java/com/steerinfo/dil/util/PageListAdd.java
  46. 11 0
      src/main/java/com/steerinfo/dil/util/util.java
  47. 9 0
      src/main/resources/application-dev.yml
  48. 8 0
      src/main/resources/application-prod.yml
  49. 0 0
      src/main/resources/application.yml
  50. 50 0
      src/main/resources/bootstrap.yml
  51. 532 0
      src/main/resources/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.xml
  52. 529 0
      src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml
  53. 345 0
      src/main/resources/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml
  54. 509 0
      src/main/resources/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml
  55. 962 0
      src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml
  56. 268 0
      src/main/resources/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.xml
  57. 322 0
      src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml
  58. 574 0
      src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml
  59. 80 0
      src/main/resources/log4j.properties
  60. 4 0
      src/main/resources/message.properties

+ 8 - 0
.gitignore

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

+ 152 - 0
pom.xml

@@ -0,0 +1,152 @@
+<?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-api</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>
+                        <param>TMSTRUCK_WEIGHT_RESULT</param><!--运力-->
+                    </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>

+ 26 - 0
src/main/java/com/steerinfo/DilApplicationMain.java

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

+ 22 - 0
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("*");
+    }
+}

+ 43 - 0
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) {
+    }
+}

+ 41 - 0
src/main/java/com/steerinfo/dil/controller/AmsPurchaseOrderController.java

@@ -0,0 +1,41 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.AmsPurchaseOrderServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/amspurchaseorder")
+public class AmsPurchaseOrderController extends BaseRESTfulController {
+
+    @Autowired
+    AmsPurchaseOrderServiceImpl amsPurchaseOrderService;
+
+    /**
+     * 采购订单管理对接接口
+     *
+     * @param mapVal
+     * @return
+     */
+    @ApiModelProperty(value = "采购订单管理对接接口")
+    @PostMapping("/operationPurchaseOrder")
+    public int operationPurchaseOrder(@RequestBody Map<String, Object> mapVal) {
+        int result = amsPurchaseOrderService.operationPurchaseOrder(mapVal);
+        return result;
+    }
+
+
+}

+ 78 - 0
src/main/java/com/steerinfo/dil/controller/RmsMaterialController.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
+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.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/rmsmaterial")
+public class RmsMaterialController extends BaseRESTfulController {
+
+    @Autowired
+    RmsMaterialServiceImpl rmsMaterialService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 物资管理对接接口
+     *
+     * @param mapVal
+     * @return
+     */
+    @ApiModelProperty(value = "物资管理对接接口")
+    @PostMapping("/operationMaterial")
+    public int operationMaterial(@RequestBody Map<String, Object> mapVal) {
+        int result = rmsMaterialService.operationMaterial(mapVal);
+        return result;
+    }
+
+    /**
+     * 展示物资信息
+     * @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 = "196", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getMaterialList")
+    public RESTfulResult getMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId){
+        List<Map<String,Object>> list = rmsMaterialService.getMaterialList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = rmsMaterialService.getMaterialList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+}

+ 78 - 0
src/main/java/com/steerinfo/dil/controller/RmsPersonnelController.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.RmsPersonnelServiceImpl;
+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.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/23 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/rmspersonnel")
+public class RmsPersonnelController extends BaseRESTfulController {
+
+    @Autowired
+    RmsPersonnelServiceImpl rmsPersonnelService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 人员管理对接接口
+     *
+     * @param mapVal
+     * @return
+     */
+    @ApiModelProperty(value = "人员管理对接接口")
+    @PostMapping("/operationPersonnel")
+    public int operationPersonnel(@RequestBody Map<String, Object> mapVal) {
+        int result = rmsPersonnelService.operationPersonnel(mapVal);
+        return result;
+    }
+
+    /**
+     * 展示人员信息
+     * @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 = "197", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getPersonnelList")
+    public RESTfulResult getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId){
+        List<Map<String,Object>> list = rmsPersonnelService.getPersonnelList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = rmsPersonnelService.getPersonnelList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+}

+ 78 - 0
src/main/java/com/steerinfo/dil/controller/RmsSupplierController.java

@@ -0,0 +1,78 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.RmsSupplierServiceImpl;
+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.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/23 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/rmssupplier")
+public class RmsSupplierController extends BaseRESTfulController {
+
+    @Autowired
+    RmsSupplierServiceImpl rmsSupplierService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    /**
+     * 供应商管理对接接口
+     *
+     * @param mapVal
+     * @return
+     */
+    @ApiModelProperty(value = "供应商管理对接接口")
+    @PostMapping("/operationSupplier")
+    public int operationSupplier(@RequestBody Map<String, Object> mapVal) {
+        int result = rmsSupplierService.operationSupplier(mapVal);
+        return result;
+    }
+
+    /**
+     * 展示供应商信息
+     * @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 = "198", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping(value = "/getSupplierList")
+    public RESTfulResult getSupplierList(@RequestBody(required = false) Map<String,Object> mapVal,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId){
+        List<Map<String,Object>> list = rmsSupplierService.getSupplierList(mapVal);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = rmsSupplierService.getSupplierList(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+
+}

+ 40 - 0
src/main/java/com/steerinfo/dil/controller/TmstruckMeasureCommissionController.java

@@ -0,0 +1,40 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmstruckMeasureCommissionServiceImpl;
+import com.steerinfo.dil.service.impl.TmstruckWeightResultServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/25 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstruckmeasurecommission")
+public class TmstruckMeasureCommissionController extends BaseRESTfulController {
+
+    @Autowired
+    TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+
+    /**
+     * 推送运输订单信息(计量委托)
+     *
+     * @param orderNumber
+     * @return
+     */
+    @ApiModelProperty(value = "推送运输订单信息(计量委托)")
+    @PostMapping("/pushTruckWeightApply")
+    public int pushTruckWeightApply(@RequestParam String orderNumber,
+                                    Integer type) {
+        Map<String,Object> resultMap = tmstruckMeasureCommissionService.pushTruckWeightApply(orderNumber,type);
+        return 0;
+    }
+
+
+}

+ 38 - 0
src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmstruckWeightResultServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/25 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstruckweightresult")
+public class TmstruckWeightResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmstruckWeightResultServiceImpl tmstruckWeightResultService;
+
+    /**
+     * 接收计量实绩(计量实绩)
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiModelProperty(value = "接收计量实绩")
+    @PostMapping("/receiveTmsTruckWeightResult")
+    public int receiveTmsTruckWeightResult(@RequestBody Map<String,Object> mapValue) {
+        int result = tmstruckWeightResultService.receiveTmsTruckWeightResult(mapValue);
+        return result;
+    }
+
+
+}

+ 19 - 0
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.1.241:8083")
+public interface ColumnDataFeign {
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+}

+ 26 - 0
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();
+    }
+
+}

+ 25 - 0
src/main/java/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.java

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsPurchaseOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+@Mapper
+public interface AmsPurchaseOrderMapper extends IBaseMapper<AmsPurchaseOrder, BigDecimal> {
+
+    // 通过物资唯一编码和外轮船名得到批次
+    BigDecimal getBatchId(Map<String, Object> map);
+
+    // 通过供应商代码得到供应商id
+    BigDecimal getSupplierId(String supplierDutyParagraph);
+
+    // 通过名称查询收货单位
+    BigDecimal getShipperId(String receiveUnit);
+
+    @Select("select seq__AMS_PURCHASE.nextval from dual")
+    BigDecimal getPurchaseId();
+}

+ 23 - 0
src/main/java/com/steerinfo/dil/mapper/RmsMaterialMapper.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsMaterial;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal> {
+
+    @Select("select seq__RMS_MATERIAL.nextval from dual")
+    BigDecimal getMaterialId();
+
+    @Override
+    List<RmsMaterial> selectByParameters(Map<String, Object> parameters);
+
+    // 展示物资信息
+    List<Map<String, Object>> getMaterialList(Map<String, Object> mapVal);
+}

+ 16 - 0
src/main/java/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsMaterialType;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigDecimal> {
+
+    @Override
+    List<RmsMaterialType> selectByParameters(Map<String, Object> parameters);
+}

+ 23 - 0
src/main/java/com/steerinfo/dil/mapper/RmsPersonnelMapper.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsPersonnel;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RmsPersonnelMapper extends IBaseMapper<RmsPersonnel, BigDecimal>{
+
+    @Select("select seq__RMS_PERSONNEL.nextval from dual")
+    BigDecimal getPersonnelId();
+
+    @Override
+    List<RmsPersonnel> selectByParameters(Map<String, Object> parameters);
+
+    // 展示人员信息列表
+    List<Map<String, Object>> getPersonnelList(Map<String, Object> mapVal);
+}

+ 23 - 0
src/main/java/com/steerinfo/dil/mapper/RmsSupplierMapper.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsSupplier;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RmsSupplierMapper extends IBaseMapper<RmsSupplier, BigDecimal> {
+
+    @Select("select seq__RMS_SUPPLIER.nextval from dual")
+    BigDecimal getSupplierId();
+
+    @Override
+    List<RmsSupplier> selectByParameters(Map<String, Object> parameters);
+
+    // 查询供应商列表
+    List<Map<String, Object>> getSupplierList(Map<String, Object> mapVal);
+}

+ 16 - 0
src/main/java/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.java

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsUnitOfMeasure;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface RmsUnitOfMeasureMapper extends IBaseMapper<RmsUnitOfMeasure, BigDecimal> {
+
+    @Override
+    List<RmsUnitOfMeasure> selectByParameters(Map<String, Object> parameters);
+}

+ 21 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.java

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckMeasureCommission;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMeasureCommission, BigDecimal> {
+    // 得到总实绩id
+    BigDecimal getResultTotalId(String orderNumber);
+
+    @Select("select seq__TMS_COMMISSION.nextval from dual")
+    BigDecimal getCommssionId();
+
+    // 得到计量委托信息
+    Map<String, Object> getMeasureCommission(String orderNumber);
+}

+ 17 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.java

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckWeightResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightResult, Short> {
+
+    // 得到计重实绩主键id
+    BigDecimal getWeightTaskResultId(String orderNumber);
+
+    // 得到汽车衡id
+    BigDecimal getTruckCalculateId(String resultCalculateNumber);
+
+}

+ 274 - 0
src/main/java/com/steerinfo/dil/model/AmsPurchaseOrder.java

@@ -0,0 +1,274 @@
+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 AmsPurchaseOrder implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PURCHASE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal purchaseOrderId;
+
+    /**
+     * 采购订单号(PURCHASE_ORDER_NO,VARCHAR,25)
+     */
+    @ApiModelProperty(value="采购订单号",required=false)
+    private String purchaseOrderNo;
+
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="批次ID",required=false)
+    private BigDecimal batchId;
+
+    /**
+     * 订单日期(PURCHASE_ORDER_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="订单日期",required=false)
+    private Date purchaseOrderDate;
+
+    /**
+     * 供应商ID(SUPPLIER_UNIT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="供应商ID",required=false)
+    private BigDecimal supplierUnitId;
+
+    /**
+     * 采购组织ID(PURCHASING_ORGANIZATION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="采购组织ID",required=false)
+    private BigDecimal purchasingOrganizationId;
+
+    /**
+     * 采购员(PURCHASE_ORDER_BUYER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="采购员",required=false)
+    private String purchaseOrderBuyer;
+
+    /**
+     * 订货数量(PUCHASE_ORDER_MATERIAL_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订货数量",required=false)
+    private BigDecimal puchaseOrderMaterialNumber;
+
+    /**
+     * 收货单位(RECEIVE_UNIT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="收货单位",required=false)
+    private BigDecimal receiveUnitId;
+
+    /**
+     * 交货日期(PUCHASE_ORDER_DELIVERY_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="交货日期",required=false)
+    private Date puchaseOrderDeliveryDate;
+
+    /**
+     * 记录创建人(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.purchaseOrderId;
+    }
+
+    @Override
+    public void setId(BigDecimal purchaseOrderId) {
+        this.purchaseOrderId = purchaseOrderId;
+    }
+
+    public BigDecimal getPurchaseOrderId() {
+        return purchaseOrderId;
+    }
+
+    public void setPurchaseOrderId(BigDecimal purchaseOrderId) {
+        this.purchaseOrderId = purchaseOrderId;
+    }
+
+    public String getPurchaseOrderNo() {
+        return purchaseOrderNo;
+    }
+
+    public void setPurchaseOrderNo(String purchaseOrderNo) {
+        this.purchaseOrderNo = purchaseOrderNo == null ? null : purchaseOrderNo.trim();
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public Date getPurchaseOrderDate() {
+        return purchaseOrderDate;
+    }
+
+    public void setPurchaseOrderDate(Date purchaseOrderDate) {
+        this.purchaseOrderDate = purchaseOrderDate;
+    }
+
+    public BigDecimal getSupplierUnitId() {
+        return supplierUnitId;
+    }
+
+    public void setSupplierUnitId(BigDecimal supplierUnitId) {
+        this.supplierUnitId = supplierUnitId;
+    }
+
+    public BigDecimal getPurchasingOrganizationId() {
+        return purchasingOrganizationId;
+    }
+
+    public void setPurchasingOrganizationId(BigDecimal purchasingOrganizationId) {
+        this.purchasingOrganizationId = purchasingOrganizationId;
+    }
+
+    public String getPurchaseOrderBuyer() {
+        return purchaseOrderBuyer;
+    }
+
+    public void setPurchaseOrderBuyer(String purchaseOrderBuyer) {
+        this.purchaseOrderBuyer = purchaseOrderBuyer == null ? null : purchaseOrderBuyer.trim();
+    }
+
+    public BigDecimal getPuchaseOrderMaterialNumber() {
+        return puchaseOrderMaterialNumber;
+    }
+
+    public void setPuchaseOrderMaterialNumber(BigDecimal puchaseOrderMaterialNumber) {
+        this.puchaseOrderMaterialNumber = puchaseOrderMaterialNumber;
+    }
+
+    public BigDecimal getReceiveUnitId() {
+        return receiveUnitId;
+    }
+
+    public void setReceiveUnitId(BigDecimal receiveUnitId) {
+        this.receiveUnitId = receiveUnitId;
+    }
+
+    public Date getPuchaseOrderDeliveryDate() {
+        return puchaseOrderDeliveryDate;
+    }
+
+    public void setPuchaseOrderDeliveryDate(Date puchaseOrderDeliveryDate) {
+        this.puchaseOrderDeliveryDate = puchaseOrderDeliveryDate;
+    }
+
+    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(", purchaseOrderId=").append(purchaseOrderId);
+        sb.append(", purchaseOrderNo=").append(purchaseOrderNo);
+        sb.append(", batchId=").append(batchId);
+        sb.append(", purchaseOrderDate=").append(purchaseOrderDate);
+        sb.append(", supplierUnitId=").append(supplierUnitId);
+        sb.append(", purchasingOrganizationId=").append(purchasingOrganizationId);
+        sb.append(", purchaseOrderBuyer=").append(purchaseOrderBuyer);
+        sb.append(", puchaseOrderMaterialNumber=").append(puchaseOrderMaterialNumber);
+        sb.append(", receiveUnitId=").append(receiveUnitId);
+        sb.append(", puchaseOrderDeliveryDate=").append(puchaseOrderDeliveryDate);
+        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();
+    }
+}

+ 259 - 0
src/main/java/com/steerinfo/dil/model/RmsMaterial.java

@@ -0,0 +1,259 @@
+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 RmsMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal materialId;
+
+    /**
+     * 物资类型ID(MATERIAL_TYPE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资类型ID",required=false)
+    private BigDecimal materialTypeId;
+
+    /**
+     * 计量单位ID(UNIT_OF_MEASURE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计量单位ID",required=false)
+    private BigDecimal unitOfMeasureId;
+
+    /**
+     * 物资编码(物资名称+规格型号+物资长度)(MATERIAL_CODE,VARCHAR,200)
+     */
+    @ApiModelProperty(value="物资编码(物资名称+规格型号+物资长度)",required=false)
+    private String materialCode;
+
+    /**
+     * 物资名称(MATERIAL_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="物资名称",required=false)
+    private String materialName;
+
+    /**
+     * 规格(MATERIAL_SPECIFICATION,VARCHAR,100)
+     */
+    @ApiModelProperty(value="规格",required=false)
+    private String materialSpecification;
+
+    /**
+     * 型号(MATERIAL_MODEL,VARCHAR,100)
+     */
+    @ApiModelProperty(value="型号",required=false)
+    private String materialModel;
+
+    /**
+     * 长度(MATERIAL_LENGTH,DECIMAL,0)
+     */
+    @ApiModelProperty(value="长度",required=false)
+    private BigDecimal materialLength;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 金蝶物资主键ID(EAS_MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="金蝶物资主键ID",required=false)
+    private BigDecimal easMaterialId;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.materialId;
+    }
+
+    @Override
+    public void setId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(BigDecimal materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public BigDecimal getUnitOfMeasureId() {
+        return unitOfMeasureId;
+    }
+
+    public void setUnitOfMeasureId(BigDecimal unitOfMeasureId) {
+        this.unitOfMeasureId = unitOfMeasureId;
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getMaterialSpecification() {
+        return materialSpecification;
+    }
+
+    public void setMaterialSpecification(String materialSpecification) {
+        this.materialSpecification = materialSpecification == null ? null : materialSpecification.trim();
+    }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel == null ? null : materialModel.trim();
+    }
+
+    public BigDecimal getMaterialLength() {
+        return materialLength;
+    }
+
+    public void setMaterialLength(BigDecimal materialLength) {
+        this.materialLength = materialLength;
+    }
+
+    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 getEasMaterialId() {
+        return easMaterialId;
+    }
+
+    public void setEasMaterialId(BigDecimal easMaterialId) {
+        this.easMaterialId = easMaterialId;
+    }
+
+    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(", materialId=").append(materialId);
+        sb.append(", materialTypeId=").append(materialTypeId);
+        sb.append(", unitOfMeasureId=").append(unitOfMeasureId);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", materialSpecification=").append(materialSpecification);
+        sb.append(", materialModel=").append(materialModel);
+        sb.append(", materialLength=").append(materialLength);
+        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(", easMaterialId=").append(easMaterialId);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 184 - 0
src/main/java/com/steerinfo/dil/model/RmsMaterialType.java

@@ -0,0 +1,184 @@
+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 RmsMaterialType implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(MATERIAL_TYPE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal materialTypeId;
+
+    /**
+     * 物资类型名称(钢材、铸管、危化品、钢渣、水渣、废旧物资、焦炭)(MATERIAL_TYPE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="物资类型名称(钢材、铸管、危化品、钢渣、水渣、废旧物资、焦炭)",required=false)
+    private String materialTypeName;
+
+    /**
+     * 数量单位(件、支)(MATERIAL_UNIT,VARCHAR,20)
+     */
+    @ApiModelProperty(value="数量单位(件、支)",required=false)
+    private String materialUnit;
+
+    /**
+     * 装卸货次序(MATERIAL_ORDER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="装卸货次序",required=false)
+    private BigDecimal materialOrder;
+
+    /**
+     * 包装类型(MATERIAL_PACKING_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="包装类型",required=false)
+    private String materialPackingType;
+
+    /**
+     * 记录创建人(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.materialTypeId;
+    }
+
+    @Override
+    public void setId(BigDecimal materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public BigDecimal getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(BigDecimal materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public String getMaterialTypeName() {
+        return materialTypeName;
+    }
+
+    public void setMaterialTypeName(String materialTypeName) {
+        this.materialTypeName = materialTypeName == null ? null : materialTypeName.trim();
+    }
+
+    public String getMaterialUnit() {
+        return materialUnit;
+    }
+
+    public void setMaterialUnit(String materialUnit) {
+        this.materialUnit = materialUnit == null ? null : materialUnit.trim();
+    }
+
+    public BigDecimal getMaterialOrder() {
+        return materialOrder;
+    }
+
+    public void setMaterialOrder(BigDecimal materialOrder) {
+        this.materialOrder = materialOrder;
+    }
+
+    public String getMaterialPackingType() {
+        return materialPackingType;
+    }
+
+    public void setMaterialPackingType(String materialPackingType) {
+        this.materialPackingType = materialPackingType == null ? null : materialPackingType.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(", materialTypeId=").append(materialTypeId);
+        sb.append(", materialTypeName=").append(materialTypeName);
+        sb.append(", materialUnit=").append(materialUnit);
+        sb.append(", materialOrder=").append(materialOrder);
+        sb.append(", materialPackingType=").append(materialPackingType);
+        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();
+    }
+}

+ 259 - 0
src/main/java/com/steerinfo/dil/model/RmsPersonnel.java

@@ -0,0 +1,259 @@
+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 RmsPersonnel implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PERSONNEL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal personnelId;
+
+    /**
+     * 工号(PERSONNEL_JOB_NUMBER,VARCHAR,20)
+     */
+    @ApiModelProperty(value="工号",required=false)
+    private String personnelJobNumber;
+
+    /**
+     * 岗位(PERSONNEL_POST,VARCHAR,20)
+     */
+    @ApiModelProperty(value="岗位",required=false)
+    private String personnelPost;
+
+    /**
+     * 姓名(PERSONNEL_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="姓名",required=false)
+    private String personnelName;
+
+    /**
+     * 部门ID(关联托运人)(PERSONNEL_DEPARTMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="部门ID(关联托运人)",required=false)
+    private BigDecimal personnelDepartmentId;
+
+    /**
+     * 车间(PERSONNEL_WORKSHOPID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="车间",required=false)
+    private BigDecimal personnelWorkshopid;
+
+    /**
+     * 班次(早、中、夜)(PERSONNEL_SHIFTS,VARCHAR,20)
+     */
+    @ApiModelProperty(value="班次(早、中、夜)",required=false)
+    private String personnelShifts;
+
+    /**
+     * 班组(A、B......)(PERSONNEL_TEAM,VARCHAR,20)
+     */
+    @ApiModelProperty(value="班组(A、B......)",required=false)
+    private String personnelTeam;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 金蝶人员信息主键ID(EAS_PERSONNEL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="金蝶人员信息主键ID",required=false)
+    private BigDecimal easPersonnelId;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.personnelId;
+    }
+
+    @Override
+    public void setId(BigDecimal personnelId) {
+        this.personnelId = personnelId;
+    }
+
+    public BigDecimal getPersonnelId() {
+        return personnelId;
+    }
+
+    public void setPersonnelId(BigDecimal personnelId) {
+        this.personnelId = personnelId;
+    }
+
+    public String getPersonnelJobNumber() {
+        return personnelJobNumber;
+    }
+
+    public void setPersonnelJobNumber(String personnelJobNumber) {
+        this.personnelJobNumber = personnelJobNumber == null ? null : personnelJobNumber.trim();
+    }
+
+    public String getPersonnelPost() {
+        return personnelPost;
+    }
+
+    public void setPersonnelPost(String personnelPost) {
+        this.personnelPost = personnelPost == null ? null : personnelPost.trim();
+    }
+
+    public String getPersonnelName() {
+        return personnelName;
+    }
+
+    public void setPersonnelName(String personnelName) {
+        this.personnelName = personnelName == null ? null : personnelName.trim();
+    }
+
+    public BigDecimal getPersonnelDepartmentId() {
+        return personnelDepartmentId;
+    }
+
+    public void setPersonnelDepartmentId(BigDecimal personnelDepartmentId) {
+        this.personnelDepartmentId = personnelDepartmentId;
+    }
+
+    public BigDecimal getPersonnelWorkshopid() {
+        return personnelWorkshopid;
+    }
+
+    public void setPersonnelWorkshopid(BigDecimal personnelWorkshopid) {
+        this.personnelWorkshopid = personnelWorkshopid;
+    }
+
+    public String getPersonnelShifts() {
+        return personnelShifts;
+    }
+
+    public void setPersonnelShifts(String personnelShifts) {
+        this.personnelShifts = personnelShifts == null ? null : personnelShifts.trim();
+    }
+
+    public String getPersonnelTeam() {
+        return personnelTeam;
+    }
+
+    public void setPersonnelTeam(String personnelTeam) {
+        this.personnelTeam = personnelTeam == null ? null : personnelTeam.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 getEasPersonnelId() {
+        return easPersonnelId;
+    }
+
+    public void setEasPersonnelId(BigDecimal easPersonnelId) {
+        this.easPersonnelId = easPersonnelId;
+    }
+
+    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(", personnelId=").append(personnelId);
+        sb.append(", personnelJobNumber=").append(personnelJobNumber);
+        sb.append(", personnelPost=").append(personnelPost);
+        sb.append(", personnelName=").append(personnelName);
+        sb.append(", personnelDepartmentId=").append(personnelDepartmentId);
+        sb.append(", personnelWorkshopid=").append(personnelWorkshopid);
+        sb.append(", personnelShifts=").append(personnelShifts);
+        sb.append(", personnelTeam=").append(personnelTeam);
+        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(", easPersonnelId=").append(easPersonnelId);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 499 - 0
src/main/java/com/steerinfo/dil/model/RmsSupplier.java

@@ -0,0 +1,499 @@
+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 RmsSupplier implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(SUPPLIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal supplierId;
+
+    /**
+     * 供应商名称(SUPPLIER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="供应商名称",required=false)
+    private String supplierName;
+
+    /**
+     * 供应商简称(SUPPLIER_ABBREVIATION,VARCHAR,32)
+     */
+    @ApiModelProperty(value="供应商简称",required=false)
+    private String supplierAbbreviation;
+
+    /**
+     * 地址(SUPPLIER_ADDRESS,VARCHAR,64)
+     */
+    @ApiModelProperty(value="地址",required=false)
+    private String supplierAddress;
+
+    /**
+     * 法人代表(SUPPLIER_LEGAL_REPRESENTATIVE,VARCHAR,16)
+     */
+    @ApiModelProperty(value="法人代表",required=false)
+    private String supplierLegalRepresentative;
+
+    /**
+     * 注册号(SUPPLIER_REGISTER_NO,VARCHAR,32)
+     */
+    @ApiModelProperty(value="注册号",required=false)
+    private String supplierRegisterNo;
+
+    /**
+     * 委托代理人(SUPPLIER_AGENT,VARCHAR,16)
+     */
+    @ApiModelProperty(value="委托代理人",required=false)
+    private String supplierAgent;
+
+    /**
+     * 联系电话(SUPPLIER_CONTACT_NUMBER,VARCHAR,32)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String supplierContactNumber;
+
+    /**
+     * 传真(SUPPLIER_FAX,VARCHAR,32)
+     */
+    @ApiModelProperty(value="传真",required=false)
+    private String supplierFax;
+
+    /**
+     * 账户(SUPPLIER_ACCOUNT,VARCHAR,32)
+     */
+    @ApiModelProperty(value="账户",required=false)
+    private String supplierAccount;
+
+    /**
+     * 开户行(SUPPLIER_ACCOUNT_BLANK,VARCHAR,32)
+     */
+    @ApiModelProperty(value="开户行",required=false)
+    private String supplierAccountBlank;
+
+    /**
+     * 税号(SUPPLIER_DUTY_PARAGRAPH,VARCHAR,32)
+     */
+    @ApiModelProperty(value="税号",required=false)
+    private String supplierDutyParagraph;
+
+    /**
+     * 邮政编码(SUPPLIER_POSTAL_CODE,VARCHAR,16)
+     */
+    @ApiModelProperty(value="邮政编码",required=false)
+    private String supplierPostalCode;
+
+    /**
+     * 注册资本(SUPPLIER_REGISTER_CAPITAL,VARCHAR,16)
+     */
+    @ApiModelProperty(value="注册资本",required=false)
+    private String supplierRegisterCapital;
+
+    /**
+     * 经营范围(SUPPLIERBUSINESS_SCOPE,VARCHAR,256)
+     */
+    @ApiModelProperty(value="经营范围",required=false)
+    private String supplierbusinessScope;
+
+    /**
+     * 企业状态(SUPPLIER_COMPANY_STATUS,VARCHAR,16)
+     */
+    @ApiModelProperty(value="企业状态",required=false)
+    private String supplierCompanyStatus;
+
+    /**
+     * 经营期限(SUPPLIER_OPERATION_PERIOD,VARCHAR,16)
+     */
+    @ApiModelProperty(value="经营期限",required=false)
+    private String supplierOperationPeriod;
+
+    /**
+     * 成立日期(SUPPLIER_REGISTER_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="成立日期",required=false)
+    private Date supplierRegisterDate;
+
+    /**
+     * 登记机构(SUPPLIER_REGISTER_ORGANIZATION,VARCHAR,16)
+     */
+    @ApiModelProperty(value="登记机构",required=false)
+    private String supplierRegisterOrganization;
+
+    /**
+     * 相关资质(SUPPLIER_REGISTER_APTITUDES,VARCHAR,16)
+     */
+    @ApiModelProperty(value="相关资质",required=false)
+    private String supplierRegisterAptitudes;
+
+    /**
+     * 企业资信等级(SUPPLIER_CREDENTIAL,VARCHAR,16)
+     */
+    @ApiModelProperty(value="企业资信等级",required=false)
+    private String supplierCredential;
+
+    /**
+     * 联系人(SUPPLIER_CONTACTS_NAME,VARCHAR,8)
+     */
+    @ApiModelProperty(value="联系人",required=false)
+    private String supplierContactsName;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 金蝶供应商主键ID(EAS_SUPPLIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="金蝶供应商主键ID",required=false)
+    private BigDecimal easSupplierId;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 经营许可证(照片)(SUPPLIER_BUSINESS_LICENSE,BLOB,4000)
+     */
+    @ApiModelProperty(value="经营许可证(照片)",required=false)
+    private byte[] supplierBusinessLicense;
+
+    /**
+     * 营业执照(SUPPLIER_BUSINESS_ABLELICENSE,BLOB,4000)
+     */
+    @ApiModelProperty(value="营业执照",required=false)
+    private byte[] supplierBusinessAblelicense;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.supplierId;
+    }
+
+    @Override
+    public void setId(BigDecimal supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public BigDecimal getSupplierId() {
+        return supplierId;
+    }
+
+    public void setSupplierId(BigDecimal supplierId) {
+        this.supplierId = supplierId;
+    }
+
+    public String getSupplierName() {
+        return supplierName;
+    }
+
+    public void setSupplierName(String supplierName) {
+        this.supplierName = supplierName == null ? null : supplierName.trim();
+    }
+
+    public String getSupplierAbbreviation() {
+        return supplierAbbreviation;
+    }
+
+    public void setSupplierAbbreviation(String supplierAbbreviation) {
+        this.supplierAbbreviation = supplierAbbreviation == null ? null : supplierAbbreviation.trim();
+    }
+
+    public String getSupplierAddress() {
+        return supplierAddress;
+    }
+
+    public void setSupplierAddress(String supplierAddress) {
+        this.supplierAddress = supplierAddress == null ? null : supplierAddress.trim();
+    }
+
+    public String getSupplierLegalRepresentative() {
+        return supplierLegalRepresentative;
+    }
+
+    public void setSupplierLegalRepresentative(String supplierLegalRepresentative) {
+        this.supplierLegalRepresentative = supplierLegalRepresentative == null ? null : supplierLegalRepresentative.trim();
+    }
+
+    public String getSupplierRegisterNo() {
+        return supplierRegisterNo;
+    }
+
+    public void setSupplierRegisterNo(String supplierRegisterNo) {
+        this.supplierRegisterNo = supplierRegisterNo == null ? null : supplierRegisterNo.trim();
+    }
+
+    public String getSupplierAgent() {
+        return supplierAgent;
+    }
+
+    public void setSupplierAgent(String supplierAgent) {
+        this.supplierAgent = supplierAgent == null ? null : supplierAgent.trim();
+    }
+
+    public String getSupplierContactNumber() {
+        return supplierContactNumber;
+    }
+
+    public void setSupplierContactNumber(String supplierContactNumber) {
+        this.supplierContactNumber = supplierContactNumber == null ? null : supplierContactNumber.trim();
+    }
+
+    public String getSupplierFax() {
+        return supplierFax;
+    }
+
+    public void setSupplierFax(String supplierFax) {
+        this.supplierFax = supplierFax == null ? null : supplierFax.trim();
+    }
+
+    public String getSupplierAccount() {
+        return supplierAccount;
+    }
+
+    public void setSupplierAccount(String supplierAccount) {
+        this.supplierAccount = supplierAccount == null ? null : supplierAccount.trim();
+    }
+
+    public String getSupplierAccountBlank() {
+        return supplierAccountBlank;
+    }
+
+    public void setSupplierAccountBlank(String supplierAccountBlank) {
+        this.supplierAccountBlank = supplierAccountBlank == null ? null : supplierAccountBlank.trim();
+    }
+
+    public String getSupplierDutyParagraph() {
+        return supplierDutyParagraph;
+    }
+
+    public void setSupplierDutyParagraph(String supplierDutyParagraph) {
+        this.supplierDutyParagraph = supplierDutyParagraph == null ? null : supplierDutyParagraph.trim();
+    }
+
+    public String getSupplierPostalCode() {
+        return supplierPostalCode;
+    }
+
+    public void setSupplierPostalCode(String supplierPostalCode) {
+        this.supplierPostalCode = supplierPostalCode == null ? null : supplierPostalCode.trim();
+    }
+
+    public String getSupplierRegisterCapital() {
+        return supplierRegisterCapital;
+    }
+
+    public void setSupplierRegisterCapital(String supplierRegisterCapital) {
+        this.supplierRegisterCapital = supplierRegisterCapital == null ? null : supplierRegisterCapital.trim();
+    }
+
+    public String getSupplierbusinessScope() {
+        return supplierbusinessScope;
+    }
+
+    public void setSupplierbusinessScope(String supplierbusinessScope) {
+        this.supplierbusinessScope = supplierbusinessScope == null ? null : supplierbusinessScope.trim();
+    }
+
+    public String getSupplierCompanyStatus() {
+        return supplierCompanyStatus;
+    }
+
+    public void setSupplierCompanyStatus(String supplierCompanyStatus) {
+        this.supplierCompanyStatus = supplierCompanyStatus == null ? null : supplierCompanyStatus.trim();
+    }
+
+    public String getSupplierOperationPeriod() {
+        return supplierOperationPeriod;
+    }
+
+    public void setSupplierOperationPeriod(String supplierOperationPeriod) {
+        this.supplierOperationPeriod = supplierOperationPeriod == null ? null : supplierOperationPeriod.trim();
+    }
+
+    public Date getSupplierRegisterDate() {
+        return supplierRegisterDate;
+    }
+
+    public void setSupplierRegisterDate(Date supplierRegisterDate) {
+        this.supplierRegisterDate = supplierRegisterDate;
+    }
+
+    public String getSupplierRegisterOrganization() {
+        return supplierRegisterOrganization;
+    }
+
+    public void setSupplierRegisterOrganization(String supplierRegisterOrganization) {
+        this.supplierRegisterOrganization = supplierRegisterOrganization == null ? null : supplierRegisterOrganization.trim();
+    }
+
+    public String getSupplierRegisterAptitudes() {
+        return supplierRegisterAptitudes;
+    }
+
+    public void setSupplierRegisterAptitudes(String supplierRegisterAptitudes) {
+        this.supplierRegisterAptitudes = supplierRegisterAptitudes == null ? null : supplierRegisterAptitudes.trim();
+    }
+
+    public String getSupplierCredential() {
+        return supplierCredential;
+    }
+
+    public void setSupplierCredential(String supplierCredential) {
+        this.supplierCredential = supplierCredential == null ? null : supplierCredential.trim();
+    }
+
+    public String getSupplierContactsName() {
+        return supplierContactsName;
+    }
+
+    public void setSupplierContactsName(String supplierContactsName) {
+        this.supplierContactsName = supplierContactsName == null ? null : supplierContactsName.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 getEasSupplierId() {
+        return easSupplierId;
+    }
+
+    public void setEasSupplierId(BigDecimal easSupplierId) {
+        this.easSupplierId = easSupplierId;
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public byte[] getSupplierBusinessLicense() {
+        return supplierBusinessLicense;
+    }
+
+    public void setSupplierBusinessLicense(byte[] supplierBusinessLicense) {
+        this.supplierBusinessLicense = supplierBusinessLicense;
+    }
+
+    public byte[] getSupplierBusinessAblelicense() {
+        return supplierBusinessAblelicense;
+    }
+
+    public void setSupplierBusinessAblelicense(byte[] supplierBusinessAblelicense) {
+        this.supplierBusinessAblelicense = supplierBusinessAblelicense;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", supplierId=").append(supplierId);
+        sb.append(", supplierName=").append(supplierName);
+        sb.append(", supplierAbbreviation=").append(supplierAbbreviation);
+        sb.append(", supplierAddress=").append(supplierAddress);
+        sb.append(", supplierLegalRepresentative=").append(supplierLegalRepresentative);
+        sb.append(", supplierRegisterNo=").append(supplierRegisterNo);
+        sb.append(", supplierAgent=").append(supplierAgent);
+        sb.append(", supplierContactNumber=").append(supplierContactNumber);
+        sb.append(", supplierFax=").append(supplierFax);
+        sb.append(", supplierAccount=").append(supplierAccount);
+        sb.append(", supplierAccountBlank=").append(supplierAccountBlank);
+        sb.append(", supplierDutyParagraph=").append(supplierDutyParagraph);
+        sb.append(", supplierPostalCode=").append(supplierPostalCode);
+        sb.append(", supplierRegisterCapital=").append(supplierRegisterCapital);
+        sb.append(", supplierbusinessScope=").append(supplierbusinessScope);
+        sb.append(", supplierCompanyStatus=").append(supplierCompanyStatus);
+        sb.append(", supplierOperationPeriod=").append(supplierOperationPeriod);
+        sb.append(", supplierRegisterDate=").append(supplierRegisterDate);
+        sb.append(", supplierRegisterOrganization=").append(supplierRegisterOrganization);
+        sb.append(", supplierRegisterAptitudes=").append(supplierRegisterAptitudes);
+        sb.append(", supplierCredential=").append(supplierCredential);
+        sb.append(", supplierContactsName=").append(supplierContactsName);
+        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(", easSupplierId=").append(easSupplierId);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", supplierBusinessLicense=").append(supplierBusinessLicense);
+        sb.append(", supplierBusinessAblelicense=").append(supplierBusinessAblelicense);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 136 - 0
src/main/java/com/steerinfo/dil/model/RmsUnitOfMeasure.java

@@ -0,0 +1,136 @@
+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 RmsUnitOfMeasure implements IBasePO<BigDecimal> {
+    @ApiModelProperty(value="",required=true)
+    private BigDecimal unitOfMeasureId;
+
+    /**
+     * 度量单位名称(件、支、吨、根、捆)(UNIT_OF_MEASURE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="度量单位名称(件、支、吨、根、捆)",required=false)
+    private String unitOfMeasureName;
+
+    /**
+     * 记录创建人(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.unitOfMeasureId;
+    }
+
+    @Override
+    public void setId(BigDecimal unitOfMeasureId) {
+        this.unitOfMeasureId = unitOfMeasureId;
+    }
+
+    public BigDecimal getUnitOfMeasureId() {
+        return unitOfMeasureId;
+    }
+
+    public void setUnitOfMeasureId(BigDecimal unitOfMeasureId) {
+        this.unitOfMeasureId = unitOfMeasureId;
+    }
+
+    public String getUnitOfMeasureName() {
+        return unitOfMeasureName;
+    }
+
+    public void setUnitOfMeasureName(String unitOfMeasureName) {
+        this.unitOfMeasureName = unitOfMeasureName == null ? null : unitOfMeasureName.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(", unitOfMeasureId=").append(unitOfMeasureId);
+        sb.append(", unitOfMeasureName=").append(unitOfMeasureName);
+        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();
+    }
+}

+ 153 - 0
src/main/java/com/steerinfo/dil/model/TmstruckMeasureCommission.java

@@ -0,0 +1,153 @@
+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 TmstruckMeasureCommission implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(COMMSSION_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal commssionId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 计量委托类型:0:计量皮重;1:计量毛重(COMMSSION_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计量委托类型:0:计量皮重;1:计量毛重",required=false)
+    private BigDecimal commssionType;
+
+    /**
+     * 记录创建人(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.commssionId;
+    }
+
+    @Override
+    public void setId(BigDecimal commssionId) {
+        this.commssionId = commssionId;
+    }
+
+    public BigDecimal getCommssionId() {
+        return commssionId;
+    }
+
+    public void setCommssionId(BigDecimal commssionId) {
+        this.commssionId = commssionId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getCommssionType() {
+        return commssionType;
+    }
+
+    public void setCommssionType(BigDecimal commssionType) {
+        this.commssionType = commssionType;
+    }
+
+    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(", commssionId=").append(commssionId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", commssionType=").append(commssionType);
+        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();
+    }
+}

+ 289 - 0
src/main/java/com/steerinfo/dil/model/TmstruckWeightResult.java

@@ -0,0 +1,289 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="计重作业实绩表")
+public class TmstruckWeightResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(WEIGHT_TASK_RESULT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal weightTaskResultId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 磅单号(计量单号)(RESULT_POUND_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="磅单号(计量单号)",required=false)
+    private String resultPoundNo;
+
+    /**
+     * 毛重(RESULT_GROSS_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="毛重",required=false)
+    private BigDecimal resultGrossWeight;
+
+    /**
+     * 毛重时间(RESULT_GROSS_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="毛重时间",required=false)
+    private Date resultGrossWeightTime;
+
+    /**
+     * 皮重(RESULT_TARE_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="皮重",required=false)
+    private BigDecimal resultTareWeight;
+
+    /**
+     * 皮重时间(RESULT_TARE_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="皮重时间",required=false)
+    private Date resultTareWeightTime;
+
+    /**
+     * 净重(RESULT_NET_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="净重",required=false)
+    private BigDecimal resultNetWeight;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private Date deleteTime;
+
+    /**
+     * 计毛点ID(汽车衡)(RESULT_GROSS_PLACE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="计毛点ID(汽车衡)",required=false)
+    private BigDecimal resultGrossPlaceId;
+
+    /**
+     * 计皮点ID(汽车衡)(RESULT_TARE_PLACE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="计皮点ID(汽车衡)",required=false)
+    private BigDecimal resultTarePlaceId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.weightTaskResultId;
+    }
+
+    @Override
+    public void setId(BigDecimal weightTaskResultId) {
+        this.weightTaskResultId = weightTaskResultId;
+    }
+
+    public BigDecimal getWeightTaskResultId() {
+        return weightTaskResultId;
+    }
+
+    public void setWeightTaskResultId(BigDecimal weightTaskResultId) {
+        this.weightTaskResultId = weightTaskResultId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public String getResultPoundNo() {
+        return resultPoundNo;
+    }
+
+    public void setResultPoundNo(String resultPoundNo) {
+        this.resultPoundNo = resultPoundNo == null ? null : resultPoundNo.trim();
+    }
+
+    public BigDecimal getResultGrossWeight() {
+        return resultGrossWeight;
+    }
+
+    public void setResultGrossWeight(BigDecimal resultGrossWeight) {
+        this.resultGrossWeight = resultGrossWeight;
+    }
+
+    public Date getResultGrossWeightTime() {
+        return resultGrossWeightTime;
+    }
+
+    public void setResultGrossWeightTime(Date resultGrossWeightTime) {
+        this.resultGrossWeightTime = resultGrossWeightTime;
+    }
+
+    public BigDecimal getResultTareWeight() {
+        return resultTareWeight;
+    }
+
+    public void setResultTareWeight(BigDecimal resultTareWeight) {
+        this.resultTareWeight = resultTareWeight;
+    }
+
+    public Date getResultTareWeightTime() {
+        return resultTareWeightTime;
+    }
+
+    public void setResultTareWeightTime(Date resultTareWeightTime) {
+        this.resultTareWeightTime = resultTareWeightTime;
+    }
+
+    public BigDecimal getResultNetWeight() {
+        return resultNetWeight;
+    }
+
+    public void setResultNetWeight(BigDecimal resultNetWeight) {
+        this.resultNetWeight = resultNetWeight;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public BigDecimal getResultGrossPlaceId() {
+        return resultGrossPlaceId;
+    }
+
+    public void setResultGrossPlaceId(BigDecimal resultGrossPlaceId) {
+        this.resultGrossPlaceId = resultGrossPlaceId;
+    }
+
+    public BigDecimal getResultTarePlaceId() {
+        return resultTarePlaceId;
+    }
+
+    public void setResultTarePlaceId(BigDecimal resultTarePlaceId) {
+        this.resultTarePlaceId = resultTarePlaceId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", weightTaskResultId=").append(weightTaskResultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultPoundNo=").append(resultPoundNo);
+        sb.append(", resultGrossWeight=").append(resultGrossWeight);
+        sb.append(", resultGrossWeightTime=").append(resultGrossWeightTime);
+        sb.append(", resultTareWeight=").append(resultTareWeight);
+        sb.append(", resultTareWeightTime=").append(resultTareWeightTime);
+        sb.append(", resultNetWeight=").append(resultNetWeight);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", resultGrossPlaceId=").append(resultGrossPlaceId);
+        sb.append(", resultTarePlaceId=").append(resultTarePlaceId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 26 - 0
src/main/java/com/steerinfo/dil/service/IAmsPurchaseOrderService.java

@@ -0,0 +1,26 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+/**
+ * AmsPurchaseOrder服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-23 02:50
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-23
+ * 作者:generator
+ * 参考:
+ * 描述:AmsPurchaseOrder服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IAmsPurchaseOrderService {
+
+    /**
+     * 采购订单管理
+     * @param mapVal
+     * @return
+     */
+    int operationPurchaseOrder(Map<String, Object> mapVal);
+}

+ 24 - 0
src/main/java/com/steerinfo/dil/service/IRmsMaterialService.java

@@ -0,0 +1,24 @@
+package com.steerinfo.dil.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsMaterial服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 05:55
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsMaterial服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsMaterialService {
+
+    int operationMaterial(Map<String, Object> mapVal);
+
+    List<Map<String, Object>> getMaterialList(Map<String, Object> mapVal);
+}

+ 29 - 0
src/main/java/com/steerinfo/dil/service/IRmsPersonnelService.java

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsPersonnel服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 06:01
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsPersonnel服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsPersonnelService {
+
+    /**
+     * 操作人员信息
+     * @param mapVal
+     * @return
+     */
+    int operationPersonnel(Map<String, Object> mapVal);
+
+    List<Map<String, Object>> getPersonnelList(Map<String, Object> mapVal);
+}

+ 34 - 0
src/main/java/com/steerinfo/dil/service/IRmsSupplierService.java

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsSupplier服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 06:18
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsSupplier服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IRmsSupplierService {
+
+    /**
+     * 操作供应商
+     * @param mapVal
+     * @return
+     */
+    int operationSupplier(Map<String, Object> mapVal);
+
+    /**
+     * 查询供应商列表
+     * @param mapVal
+     * @return
+     */
+    List<Map<String, Object>> getSupplierList(Map<String, Object> mapVal);
+}

+ 31 - 0
src/main/java/com/steerinfo/dil/service/ITmstruckMeasureCommissionService.java

@@ -0,0 +1,31 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmstruckMeasureCommission;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmstruckMeasureCommission服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-25 02:48
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-25
+ * 作者:generator
+ * 参考:
+ * 描述:TmstruckMeasureCommission服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckMeasureCommissionService {
+
+    /**
+     * 推送运输订单信息(计量委托)
+     * @param orderNumber
+     * @param type
+     * @return
+     */
+    Map<String, Object> pushTruckWeightApply(String orderNumber,Integer type);
+}

+ 30 - 0
src/main/java/com/steerinfo/dil/service/ITmstruckWeightResultService.java

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmstruckWeightResult;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmstruckWeightResult服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-25 02:28
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-25
+ * 作者:generator
+ * 参考:
+ * 描述:TmstruckWeightResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckWeightResultService {
+
+    /**
+     * 接收计量实绩信息
+     * @param mapValue
+     * @return
+     */
+    int receiveTmsTruckWeightResult(Map<String, Object> mapValue);
+}

+ 107 - 0
src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java

@@ -0,0 +1,107 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.AmsPurchaseOrderMapper;
+import com.steerinfo.dil.model.AmsPurchaseOrder;
+import com.steerinfo.dil.service.IAmsPurchaseOrderService;
+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;
+
+/**
+ * AmsPurchaseOrder服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-23 02:50
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-23
+ * 作者:generator
+ * 参考:
+ * 描述:AmsPurchaseOrder服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "amsPurchaseOrderService")
+public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
+
+    @Autowired
+    private AmsPurchaseOrderMapper amsPurchaseOrderMapper;
+
+    /**
+     * 采购订单管理
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public int operationPurchaseOrder(Map<String, Object> mapVal) {
+        int result = 0;
+//        // 得到金蝶采购主键id
+//        Integer EASPurchaseIdValue = (Integer) mapVal.get("EASPurchaseId");
+//        BigDecimal EASPurchaseId = new BigDecimal(EASPurchaseIdValue);
+        // 得到采购订单号
+        String purchaseOrderNo = (String) mapVal.get("purchaseOrderNo");
+        // 得到物资唯一编号
+        String materialCode = (String) mapVal.get("materialCode");
+        // 得到外轮船名
+        String resultForeignShipName = (String) mapVal.get("resultForeignShipName");
+        Map<String,Object> map = new HashMap<>();
+        map.put("materialCode",materialCode);
+        map.put("resultForeignShipName",resultForeignShipName);
+        // 得到批次
+        BigDecimal batchId = amsPurchaseOrderMapper.getBatchId(map);
+        // 得到采购员
+        String purchaseOrderBuyer = (String) mapVal.get("purchaseOrderBuyer");
+//        // 得到发货单位
+//        String sendUnit = (String) mapVal.get("sendUnit");
+//        // 得到采购组织
+//        String purchaseOrganization = (String) mapVal.get("purchaseOrganization");
+        // 得到收货单位
+        String receiveUnit = (String) mapVal.get("receiveUnit");
+        BigDecimal shipperId = amsPurchaseOrderMapper.getShipperId(receiveUnit);
+        // 得到订货数量
+        Double purchaseOrderMaterialNumber = (Double) mapVal.get("purchaseOrderMaterialNumber");
+        // 得到订单日期
+        Date purchaseOrderDate = (Date) mapVal.get("purchaseOrderDate");
+        // 得到供应商代码
+        String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
+        BigDecimal supplierId = amsPurchaseOrderMapper.getSupplierId(supplierDutyParagraph);
+        // 得到数据状态
+        Integer dataStatus = (Integer) mapVal.get("dataStatus");
+        AmsPurchaseOrder amsPurchaseOrder = new AmsPurchaseOrder();
+        amsPurchaseOrder.setPurchaseOrderNo(purchaseOrderNo);
+        amsPurchaseOrder.setPurchaseOrderBuyer(purchaseOrderBuyer);
+        amsPurchaseOrder.setPurchaseOrderDate(purchaseOrderDate);
+        amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
+        amsPurchaseOrder.setBatchId(batchId);
+        amsPurchaseOrder.setSupplierUnitId(supplierId);
+        amsPurchaseOrder.setReceiveUnitId(shipperId);
+        Map<String,Object> map1 = new HashMap<>();
+        BigDecimal deleted = new BigDecimal(0);
+        map1.put("purchaseOrderNo",purchaseOrderNo);
+        map1.put("deleted",deleted);
+        List<AmsPurchaseOrder> amsPurchaseOrders = amsPurchaseOrderMapper.selectByParameters(map1);
+        // 新增
+        if (amsPurchaseOrders.size() == 0) {
+            BigDecimal purchaseId = amsPurchaseOrderMapper.getPurchaseId();
+            amsPurchaseOrder.setPurchaseOrderId(purchaseId);
+            amsPurchaseOrder.setDeleted(new BigDecimal(0));
+            result = amsPurchaseOrderMapper.insertSelective(amsPurchaseOrder);
+        }
+        if (amsPurchaseOrders.size() != 0 && dataStatus == 2) {
+            AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
+            amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
+            result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
+        }
+        if (amsPurchaseOrders.size() != 0 && dataStatus == 3) {
+            AmsPurchaseOrder amsPurchaseOrder1 = amsPurchaseOrders.get(0);
+            amsPurchaseOrder.setPurchaseOrderId(amsPurchaseOrder1.getPurchaseOrderId());
+            amsPurchaseOrder.setDeleted(new BigDecimal(1));
+            result = amsPurchaseOrderMapper.updateByPrimaryKeySelective(amsPurchaseOrder);
+        }
+        return result;
+    }
+}

+ 126 - 0
src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -0,0 +1,126 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RmsMaterialMapper;
+import com.steerinfo.dil.mapper.RmsMaterialTypeMapper;
+import com.steerinfo.dil.mapper.RmsUnitOfMeasureMapper;
+import com.steerinfo.dil.model.RmsMaterial;
+import com.steerinfo.dil.model.RmsMaterialType;
+import com.steerinfo.dil.model.RmsUnitOfMeasure;
+import com.steerinfo.dil.service.IRmsMaterialService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsMaterial服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 05:55
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsMaterial服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsMaterialService")
+public class RmsMaterialServiceImpl implements IRmsMaterialService {
+
+    @Autowired
+    private RmsMaterialMapper rmsMaterialMapper;
+    @Autowired
+    RmsMaterialTypeMapper rmsMaterialTypeMapper;
+    @Autowired
+    RmsUnitOfMeasureMapper rmsUnitOfMeasureMapper;
+
+    /**
+     * 操作物资
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public int operationMaterial(Map<String, Object> mapVal) {
+        // 得到金蝶物资主键id
+        Integer EASMaterialIdValue = (Integer) mapVal.get("EASMaterialId");
+        BigDecimal EASMaterialId = new BigDecimal(EASMaterialIdValue);
+        // 得到物资唯一编码
+        String materialCode = (String) mapVal.get("materialCode");
+        // 得到物资类型
+        String materialType = (String) mapVal.get("materialType");
+        // 得到物资名称
+        String materialName = (String) mapVal.get("materialName");
+        // 得到物资规格
+        String materialSpecification = (String) mapVal.get("materialSpecification");
+        // 得到物资型号
+        String materialModel = (String) mapVal.get("materialModel");
+        // 得到计量单位
+        String unitOfMeasure = (String) mapVal.get("unitOfMeasure");
+        // 得到长度
+        Double materialLengthValue = (Double) mapVal.get("materialLength");
+        BigDecimal materialLength = new BigDecimal(materialLengthValue);
+        // 得到数据状态
+        Integer dataStatus = (Integer) mapVal.get("dataStatus");
+        // 判断是否EASId已存在
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("easMaterialId",EASMaterialId);
+        BigDecimal deleted = new BigDecimal(0);
+        map1.put("deleted",deleted);
+        List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);
+        // 判断物资类型是否已存在
+        Map<String,Object> map2 = new HashMap<>();
+        map2.put("materialType",materialType);
+        List<RmsMaterialType> rmsMaterialTypes = rmsMaterialTypeMapper.selectByParameters(map2);
+        RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
+        // 判断单位是否已存在
+        Map<String,Object> map3 = new HashMap<>();
+        map3.put("unitOfMeasure",unitOfMeasure);
+        List<RmsUnitOfMeasure> rmsUnitOfMeasures = rmsUnitOfMeasureMapper.selectByParameters(map3);
+        RmsUnitOfMeasure rmsUnitOfMeasure = rmsUnitOfMeasures.get(0);
+        RmsMaterial rmsMaterial = new RmsMaterial();
+        rmsMaterial.setMaterialName(materialName);
+        rmsMaterial.setMaterialCode(materialCode);
+        rmsMaterial.setMaterialSpecification(materialSpecification);
+        rmsMaterial.setMaterialModel(materialModel);
+        rmsMaterial.setMaterialLength(materialLength);
+        rmsMaterial.setEasMaterialId(EASMaterialId);
+        rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+        rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        int result = 0;
+        // 新增
+        if (rmsMaterials.size() == 0) {
+            rmsMaterial.setDeleted(new BigDecimal(0));
+            BigDecimal materialId = rmsMaterialMapper.getMaterialId();
+            rmsMaterial.setMaterialId(materialId);
+            result = rmsMaterialMapper.insertSelective(rmsMaterial);
+        }
+        // 修改
+        if (rmsMaterials.size() != 0 && dataStatus == 2){
+            RmsMaterial rmsMaterial1 = rmsMaterials.get(0);
+            rmsMaterial.setMaterialId(rmsMaterial1.getMaterialId());
+            result = rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
+        }
+        // 逻辑删除
+        if (rmsMaterials.size() != 0 && dataStatus == 3) {
+            RmsMaterial rmsMaterial1 = rmsMaterials.get(0);
+            rmsMaterial.setMaterialId(rmsMaterial1.getMaterialId());
+            rmsMaterial.setDeleted(new BigDecimal(1));
+            result = rmsMaterialMapper.updateByPrimaryKeySelective(rmsMaterial);
+        }
+        return result;
+    }
+
+    /**
+     * 展示物资信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getMaterialList(Map<String, Object> mapVal) {
+        return rmsMaterialMapper.getMaterialList(mapVal);
+    }
+}

+ 91 - 0
src/main/java/com/steerinfo/dil/service/impl/RmsPersonnelServiceImpl.java

@@ -0,0 +1,91 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RmsPersonnelMapper;
+import com.steerinfo.dil.model.RmsPersonnel;
+import com.steerinfo.dil.service.IRmsPersonnelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * RmsPersonnel服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 06:01
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsPersonnel服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsPersonnelService")
+public class RmsPersonnelServiceImpl implements IRmsPersonnelService {
+
+    @Autowired
+    private RmsPersonnelMapper rmsPersonnelMapper;
+
+    /**
+     * 操作人员信息
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public int operationPersonnel(Map<String, Object> mapVal) {
+        // 得到金蝶人员管理主键id
+        Integer EASPersonnelIdValue = (Integer) mapVal.get("EASPersonnelId");
+        BigDecimal EASPersonnelId = new BigDecimal(EASPersonnelIdValue);
+        // 得到人员工号
+        String personnelJobNumber = (String) mapVal.get("personnelJobNumber");
+        // 得到人员姓名
+        String personnelName = (String) mapVal.get("personnelName");
+        // 得到数据状态
+        Integer dataStatus = (Integer) mapVal.get("dataStatus");
+        RmsPersonnel rmsPersonnel = new RmsPersonnel();
+        rmsPersonnel.setEasPersonnelId(EASPersonnelId);
+        rmsPersonnel.setPersonnelJobNumber(personnelJobNumber);
+        rmsPersonnel.setPersonnelName(personnelName);
+        BigDecimal deleted = new BigDecimal(0);
+        Map<String,Object> map = new HashMap<>();
+        map.put("easPersonnelId",EASPersonnelId);
+        map.put("deleted",deleted);
+        int result = 0;
+        List<RmsPersonnel> rmsPersonnels = rmsPersonnelMapper.selectByParameters(map);
+        // 新增
+        if (rmsPersonnels.size() == 0) {
+            BigDecimal personnelId = rmsPersonnelMapper.getPersonnelId();
+            rmsPersonnel.setPersonnelId(personnelId);
+            rmsPersonnel.setDeleted(deleted);
+            result = rmsPersonnelMapper.insertSelective(rmsPersonnel);
+        }
+        // 修改
+        if (rmsPersonnels.size() != 0 && dataStatus == 2) {
+            RmsPersonnel rmsPersonnel1 = rmsPersonnels.get(0);
+            rmsPersonnel.setPersonnelId(rmsPersonnel1.getPersonnelId());
+            result = rmsPersonnelMapper.updateByPrimaryKeySelective(rmsPersonnel);
+        }
+        // 逻辑删除
+        if (rmsPersonnels.size() != 0 && dataStatus == 3) {
+            RmsPersonnel rmsPersonnel1 = rmsPersonnels.get(0);
+            rmsPersonnel.setPersonnelId(rmsPersonnel1.getPersonnelId());
+            rmsPersonnel.setDeleted(new BigDecimal(1));
+            result = rmsPersonnelMapper.updateByPrimaryKeySelective(rmsPersonnel);
+        }
+        return result;
+    }
+
+    /**
+     * 展示人员信息列表
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPersonnelList(Map<String, Object> mapVal) {
+        return rmsPersonnelMapper.getPersonnelList(mapVal);
+    }
+}

+ 108 - 0
src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java

@@ -0,0 +1,108 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.RmsSupplierMapper;
+import com.steerinfo.dil.model.RmsSupplier;
+import com.steerinfo.dil.service.IRmsSupplierService;
+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;
+
+/**
+ * RmsSupplier服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 06:18
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-22
+ * 作者:generator
+ * 参考:
+ * 描述:RmsSupplier服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "rmsSupplierService")
+public class RmsSupplierServiceImpl implements IRmsSupplierService {
+
+    @Autowired
+    private RmsSupplierMapper rmsSupplierMapper;
+
+    /**
+     * 操作供应商
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public int operationSupplier(Map<String, Object> mapVal) {
+        // 得到金蝶主键供应商id
+        Integer EASSupplierIdValue = (Integer) mapVal.get("EASSupplierId");
+        BigDecimal EASSupplierId = new BigDecimal(EASSupplierIdValue);
+        // 得到供应商名称
+        String supplierName = (String) mapVal.get("supplierName");
+        // 得到供应商供应商简称
+        String supplierAbbreviation = (String) mapVal.get("supplierAbbreviation");
+        // 得到供应商代码
+        String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
+        // 得到供应商地址
+        String supplierAddress = (String) mapVal.get("supplierAddress");
+        // 得到注册时间
+        Date supplierRegisterDate = (Date) mapVal.get("supplierRegisterDate");
+        // 得到委托代理人
+        String supplierContactsName = (String) mapVal.get("supplierAgent");
+        // 得到联系电话
+        String supplierContactNumber = (String) mapVal.get("supplierContactNumber");
+        // 得到数据数据状态
+        Integer dataStatus = (Integer) mapVal.get("dataStatus");
+        // 判断是否EASId已存在
+        Map<String,Object> map1 = new HashMap<>();
+        map1.put("easSupplierId",EASSupplierId);
+        BigDecimal deleted = new BigDecimal(0);
+        map1.put("deleted",deleted);
+        List<RmsSupplier> rmsSuppliers = rmsSupplierMapper.selectByParameters(map1);
+        RmsSupplier rmsSupplier = new RmsSupplier();
+        rmsSupplier.setEasSupplierId(EASSupplierId);
+        rmsSupplier.setSupplierName(supplierName);
+        rmsSupplier.setSupplierAbbreviation(supplierAbbreviation);
+        rmsSupplier.setSupplierDutyParagraph(supplierDutyParagraph);
+        rmsSupplier.setSupplierAddress(supplierAddress);
+        rmsSupplier.setSupplierRegisterDate(supplierRegisterDate);
+        rmsSupplier.setSupplierContactsName(supplierContactsName);
+        rmsSupplier.setSupplierContactNumber(supplierContactNumber);
+        int result = 0;
+        // 新增
+        if (rmsSuppliers.size() == 0) {
+            BigDecimal supplierId = rmsSupplierMapper.getSupplierId();
+            rmsSupplier.setSupplierId(supplierId);
+            rmsSupplier.setDeleted(new BigDecimal(0));
+            result = rmsSupplierMapper.insertSelective(rmsSupplier);
+        }
+        // 修改
+        if (rmsSuppliers.size() != 0 && dataStatus == 2) {
+            RmsSupplier rmsSupplier1 = rmsSuppliers.get(0);
+            rmsSupplier.setSupplierId(rmsSupplier1.getSupplierId());
+            result = rmsSupplierMapper.updateByPrimaryKeySelective(rmsSupplier);
+        }
+        // 逻辑删除
+        if (rmsSuppliers.size() != 0 && dataStatus == 3) {
+            RmsSupplier rmsSupplier1 = rmsSuppliers.get(0);
+            rmsSupplier.setSupplierId(rmsSupplier1.getSupplierId());
+            rmsSupplier.setDeleted(new BigDecimal(1));
+            result = rmsSupplierMapper.updateByPrimaryKeySelective(rmsSupplier);
+        }
+        return result;
+    }
+
+    /**
+     * 查询供应商列表
+     * @param mapVal
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSupplierList(Map<String, Object> mapVal) {
+        return rmsSupplierMapper.getSupplierList(mapVal);
+    }
+}

+ 53 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -0,0 +1,53 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
+import com.steerinfo.dil.model.TmstruckMeasureCommission;
+import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * TmstruckMeasureCommission服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-25 02:48
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-25
+ * 作者:generator
+ * 参考:
+ * 描述:TmstruckMeasureCommission服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckMeasureCommissionService")
+public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCommissionService {
+
+    @Autowired
+    private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
+
+    /**
+     * 推送运输订单信息(计量委托)
+     * @param orderNumber
+     * @param type
+     * @return
+     */
+    @Override
+    public Map<String, Object> pushTruckWeightApply(String orderNumber,Integer type) {
+        TmstruckMeasureCommission tmstruckMeasureCommission = new TmstruckMeasureCommission();
+        tmstruckMeasureCommission.setResultTotalId(tmstruckMeasureCommissionMapper.getResultTotalId(orderNumber));
+        tmstruckMeasureCommission.setCommssionId(tmstruckMeasureCommissionMapper.getCommssionId());
+        if (type == 0) {
+            tmstruckMeasureCommission.setCommssionType(new BigDecimal(0));
+        }
+        else {
+            tmstruckMeasureCommission.setCommssionType(new BigDecimal(1));
+        }
+        tmstruckMeasureCommissionMapper.insertSelective(tmstruckMeasureCommission);
+        Map<String,Object> map = tmstruckMeasureCommissionMapper.getMeasureCommission(orderNumber);
+        return map;
+    }
+}

+ 69 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -0,0 +1,69 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.model.TmstruckWeightResult;
+import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
+import com.steerinfo.dil.service.ITmstruckWeightResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmstruckWeightResult服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-25 02:28
+ * 类描述
+ * 修订历史:
+ * 日期:2021-10-25
+ * 作者:generator
+ * 参考:
+ * 描述:TmstruckWeightResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckWeightResultService")
+public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultService {
+
+    @Autowired
+    TmstruckWeightResultMapper tmstruckWeightResultMapper;
+
+    /**
+     * 接收计量实绩信息
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int receiveTmsTruckWeightResult(Map<String, Object> mapValue) {
+        // 得到运输订单号
+        String orderNumber = (String) mapValue.get("orderNumber");
+        BigDecimal weightTaskResultId = tmstruckWeightResultMapper.getWeightTaskResultId(orderNumber);
+        // 得到计皮汽车衡编号
+        String tareCalculateNumber = (String) mapValue.get("tareCalculateNumber");
+        BigDecimal resultTarePlaceId = tmstruckWeightResultMapper.getTruckCalculateId(tareCalculateNumber);
+        // 得到计毛汽车衡编号
+        String grossCalculateNumber = (String) mapValue.get("grossCalculateNumber");
+        BigDecimal resultGrossPlaceId = tmstruckWeightResultMapper.getTruckCalculateId(grossCalculateNumber);
+        // 得到皮重
+        Double resultTareWeight = (Double) mapValue.get("resultTareWeight");
+        // 得到计皮时间
+        Date resultTareWeightTime = (Date) mapValue.get("resultTareWeightTime");
+        // 得到毛重
+        Double resultGrossWeight = (Double)mapValue.get("resultGrossWeight");
+        // 得到计毛时间
+        Date resultGrossWeightTime = (Date) mapValue.get("resultGrossWeightTime");
+        // 得到净重
+        Double resultNetWeight = (Double)mapValue.get("resultNetWeight");
+        TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
+        tmstruckWeightResult.setWeightTaskResultId(weightTaskResultId);
+        tmstruckWeightResult.setResultTareWeight(new BigDecimal(resultTareWeight));
+        tmstruckWeightResult.setResultTareWeightTime(resultTareWeightTime);
+        tmstruckWeightResult.setResultGrossWeight(new BigDecimal(resultGrossWeight));
+        tmstruckWeightResult.setResultGrossWeightTime(resultGrossWeightTime);
+        tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+        tmstruckWeightResult.setResultGrossPlaceId(resultGrossPlaceId);
+        tmstruckWeightResult.setResultTarePlaceId(resultTarePlaceId);
+        int result = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+        return result;
+    }
+}

+ 70 - 0
src/main/java/com/steerinfo/dil/util/BaseRESTfulController.java

@@ -0,0 +1,70 @@
+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(Object obj, String code, String msg) {
+        RESTfulResult result = this.failed(obj, msg);
+        result = new RESTfulResult("201", msg);
+        result.setCode(code);
+        return result;
+    }
+}

+ 38 - 0
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;
+    }
+}

+ 192 - 0
src/main/java/com/steerinfo/dil/util/DataConversionTool.java

@@ -0,0 +1,192 @@
+package com.steerinfo.dil.util;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+//@Auther Tiroble
+//@meil 2439003195@qq.com
+public class DataConversionTool {
+
+
+    /**
+     *
+     * @param json
+     * @param type
+     * @return
+     * @throws Exception
+     */
+    public static Object jsonToBean(Object json, Object type) throws Exception {
+        JSONObject jsonObject=null;
+        //首先需要判断是否是json字符串如果是解析为jsonObject如果是JsonObject就直接赋值给jsonObject
+        if (json instanceof String){
+            //将json转为JSONOject
+            jsonObject= JSONObject.parseObject(json.toString());
+        }else {
+            jsonObject= (JSONObject) json;
+        }
+        //获得Class对象
+        //Class clazz=type.getClass().getDeclaringClass();
+        Class clazz= (Class) type;
+        //通过空参构造器创建实例
+        Constructor constructor = clazz.getDeclaredConstructor();
+        constructor.setAccessible(true);
+        Object classObject =  constructor.newInstance();
+        //获得对象的所有属性名
+        Field[] fields = clazz.getDeclaredFields();
+        //遍历属性集合
+        for (int i=0;i<fields.length;i++){
+            Field field=fields[i];
+            //开启权限
+            field.setAccessible(true);
+            //判断是否保护属性值
+            if(jsonObject.containsKey(field.getName())){
+                Object objectValue =jsonObject.get(field.getName());
+                //判断jsonObject的item是否是String或者Integer,是简单类型直接赋值
+                if ((objectValue instanceof String)||(objectValue instanceof Integer)||(objectValue instanceof Boolean)||(objectValue instanceof BigDecimal)){
+                    //进行数据判断
+                    if (field.getType()==BigDecimal.class){
+                        field.set(classObject,new BigDecimal(objectValue.toString()));
+                    } else if (field.getType()==Short.class){
+                        field.set(classObject,Short.parseShort(objectValue.toString()));
+                    }else if (field.getType()==Date.class){
+                        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Date time = formatter.parse(objectValue.toString());
+                        field.set(classObject,time);
+                    }
+                    else {
+                        field.set(classObject,objectValue);
+                    }
+                }
+                //集合类型类型
+                else if(objectValue instanceof JSONArray){
+                    Iterator<Object> iterator = ((JSONArray) objectValue).iterator();
+                    //这里使用的是arryList接收
+                    List list=new ArrayList<>();
+                    // 如果是List类型,得到其Generic的类型
+                    Type genericType = field.getGenericType();
+                    //如果是空的
+                    if(genericType == null) {
+                        genericType=Object.class;
+                    }
+                    // 如果是泛型参数的类型
+                    else if(genericType instanceof ParameterizedType){
+                        ParameterizedType pt = (ParameterizedType) genericType;
+                        //得到泛型里的class类型对象
+                        Class<?> genericClazz = (Class<?>)pt.getActualTypeArguments()[0];
+                        genericType=genericClazz;
+                    }
+                    while (iterator.hasNext()){
+                        Object nextObject = iterator.next();
+                        Object fieldValue =  jsonToBean(nextObject, genericType);
+                        list.add(fieldValue);
+                    }
+                    field.set(classObject,list);
+                }
+                //如果不是再判断是否是JSONOArray,复杂数据类型
+                else{
+                    //如果是JSONObject需要判断是否是引用类型,如果是引用类型就还需要将值转为对应类型
+                    Object fieldValue =  jsonToBean(objectValue, field.getType());
+                    field.set(classObject,fieldValue);
+                }
+
+            }
+
+
+        }
+
+        return classObject;
+    }
+    /**
+     *
+     * @param map
+     * @param type
+     * @return
+     * @throws Exception
+     */
+    public static Object mapToBean(Map map, Object type) throws Exception {
+
+        //获得Class对象
+        //Class clazz=type.getClass().getDeclaringClass();
+        Class clazz= (Class) type;
+        //通过空参构造器创建实例
+        Constructor constructor = clazz.getDeclaredConstructor();
+        constructor.setAccessible(true);
+        Object classObject =  constructor.newInstance();
+        //获得对象的所有属性名
+        Field[] fields = clazz.getDeclaredFields();
+        //遍历属性集合
+        for (int i=0;i<fields.length;i++){
+            Field field=fields[i];
+            //开启权限
+            field.setAccessible(true);
+            //判断是否保护属性值
+            if(map.containsKey(field.getName())){
+                Object objectValue =map.get(field.getName());
+                //判断jsonObject的item是否是String或者Integer,是简单类型直接赋值
+                if ((objectValue instanceof String)||(objectValue instanceof Integer)||(objectValue instanceof Boolean)){
+                    //进行数据判断
+                    if (field.getType()==BigDecimal.class){
+                        field.set(classObject,new BigDecimal(objectValue.toString()));
+                    } else if (field.getType()==Short.class){
+                        if(objectValue.toString()=="0.00"){
+                            field.set(classObject,0);
+                        }
+                        field.set(classObject,Short.parseShort(objectValue.toString()));
+                    }else if (field.getType()==Date.class){
+                        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                        Date time = formatter.parse(objectValue.toString());
+                        field.set(classObject,time);
+                    }
+                    else {
+                        field.set(classObject,objectValue);
+                    }
+
+                }
+                //集合类型类型
+                else if(objectValue instanceof List){
+                    Iterator<Object> iterator = ((List)objectValue).iterator();
+                    //这里使用的是arryList接收
+                    List list=new ArrayList<>();
+                    // 如果是List类型,得到其Generic的类型
+                    Type genericType = field.getGenericType();
+                    //如果是空的
+                    if(genericType == null) {
+                        genericType=Object.class;
+                    }
+                    // 如果是泛型参数的类型
+                    else if(genericType instanceof ParameterizedType){
+                        ParameterizedType pt = (ParameterizedType) genericType;
+                        //得到泛型里的class类型对象
+                        Class<?> genericClazz = (Class<?>)pt.getActualTypeArguments()[0];
+                        genericType=genericClazz;
+                    }
+                    while (iterator.hasNext()){
+                        Object nextObject = iterator.next();
+                        Object fieldValue =  jsonToBean(nextObject, genericType);
+                        list.add(fieldValue);
+                    }
+                    field.set(classObject,list);
+                }
+                //如果不是再判断是否是JSONOArray,复杂数据类型
+                else{
+                    //如果是JSONObject需要判断是否是引用类型,如果是引用类型就还需要将值转为对应类型
+                    Object fieldValue =  jsonToBean(objectValue, field.getType());
+                    field.set(classObject,fieldValue);
+                }
+
+            }
+
+
+        }
+
+        return classObject;
+    }
+}

+ 33 - 0
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;
+    }
+}

+ 11 - 0
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 {
+
+}

+ 9 - 0
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: [name]
+

+ 8 - 0
src/main/resources/application-prod.yml

@@ -0,0 +1,8 @@
+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: [name]

+ 0 - 0
src/main/resources/application.yml


+ 50 - 0
src/main/resources/bootstrap.yml

@@ -0,0 +1,50 @@
+api.version: api/v1/join
+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: 8066

+ 532 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.xml

@@ -0,0 +1,532 @@
+<?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.AmsPurchaseOrderMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsPurchaseOrder">
+        <id column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId"/>
+        <result column="PURCHASE_ORDER_NO" jdbcType="VARCHAR" property="purchaseOrderNo"/>
+        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
+        <result column="PURCHASE_ORDER_DATE" jdbcType="TIMESTAMP" property="purchaseOrderDate"/>
+        <result column="SUPPLIER_UNIT_ID" jdbcType="DECIMAL" property="supplierUnitId"/>
+        <result column="PURCHASING_ORGANIZATION_ID" jdbcType="DECIMAL" property="purchasingOrganizationId"/>
+        <result column="PURCHASE_ORDER_BUYER" jdbcType="VARCHAR" property="purchaseOrderBuyer"/>
+        <result column="PUCHASE_ORDER_MATERIAL_NUMBER" jdbcType="DECIMAL" property="puchaseOrderMaterialNumber"/>
+        <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId"/>
+        <result column="PUCHASE_ORDER_DELIVERY_DATE" jdbcType="TIMESTAMP" property="puchaseOrderDeliveryDate"/>
+        <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">
+        PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
+    PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER, 
+    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.PURCHASE_ORDER_ID, t.PURCHASE_ORDER_NO, t.BATCH_ID, t.PURCHASE_ORDER_DATE, t.SUPPLIER_UNIT_ID,
+    t.PURCHASING_ORGANIZATION_ID, t.PURCHASE_ORDER_BUYER, t.PUCHASE_ORDER_MATERIAL_NUMBER, 
+    t.RECEIVE_UNIT_ID, t.PUCHASE_ORDER_DELIVERY_DATE, 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 AMS_PURCHASE_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM AMS_PURCHASE_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
+                and PURCHASE_ORDER_NO = #{purchaseOrderNo}
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="purchaseOrderDate != null">
+                and TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = #{purchaseOrderDate}
+            </if>
+            <if test="supplierUnitId != null">
+                and SUPPLIER_UNIT_ID = #{supplierUnitId}
+            </if>
+            <if test="purchasingOrganizationId != null">
+                and PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
+            </if>
+            <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
+                and PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
+            </if>
+            <if test="puchaseOrderMaterialNumber != null">
+                and PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
+            </if>
+            <if test="receiveUnitId != null">
+                and RECEIVE_UNIT_ID = #{receiveUnitId}
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                and TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = #{puchaseOrderDeliveryDate}
+            </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="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
+                and PURCHASE_ORDER_NO LIKE '%${purchaseOrderNo}%'
+            </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
+            <if test="purchaseOrderDate != null">
+                and TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = #{purchaseOrderDate}
+            </if>
+            <if test="supplierUnitId != null">
+                and SUPPLIER_UNIT_ID = #{supplierUnitId}
+            </if>
+            <if test="purchasingOrganizationId != null">
+                and PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
+            </if>
+            <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
+                and PURCHASE_ORDER_BUYER LIKE '%${purchaseOrderBuyer}%'
+            </if>
+            <if test="puchaseOrderMaterialNumber != null">
+                and PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
+            </if>
+            <if test="receiveUnitId != null">
+                and RECEIVE_UNIT_ID = #{receiveUnitId}
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                and TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = #{puchaseOrderDeliveryDate}
+            </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 AMS_PURCHASE_ORDER
+        where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from AMS_PURCHASE_ORDER
+        where 1!=1
+        <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
+            or PURCHASE_ORDER_NO = #{purchaseOrderNo}
+        </if>
+        <if test="batchId != null">
+            or BATCH_ID = #{batchId}
+        </if>
+        <if test="purchaseOrderDate != null">
+            or TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = '#{purchaseOrderDate}'
+        </if>
+        <if test="supplierUnitId != null">
+            or SUPPLIER_UNIT_ID = #{supplierUnitId}
+        </if>
+        <if test="purchasingOrganizationId != null">
+            or PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
+        </if>
+        <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
+            or PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
+        </if>
+        <if test="puchaseOrderMaterialNumber != null">
+            or PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
+        </if>
+        <if test="receiveUnitId != null">
+            or RECEIVE_UNIT_ID = #{receiveUnitId}
+        </if>
+        <if test="puchaseOrderDeliveryDate != null">
+            or TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = '#{puchaseOrderDeliveryDate}'
+        </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.AmsPurchaseOrder">
+        insert into AMS_PURCHASE_ORDER (PURCHASE_ORDER_ID, PURCHASE_ORDER_NO,
+                                        BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
+                                        PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER,
+                                        PUCHASE_ORDER_MATERIAL_NUMBER, RECEIVE_UNIT_ID,
+                                        PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME,
+                                        INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                        INSERT_UPDATE_REMARK, DELETED)
+        values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR},
+                #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP},
+                #{supplierUnitId,jdbcType=DECIMAL},
+                #{purchasingOrganizationId,jdbcType=DECIMAL}, #{purchaseOrderBuyer,jdbcType=VARCHAR},
+                #{puchaseOrderMaterialNumber,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
+                #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, #{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.AmsPurchaseOrder">
+        insert into AMS_PURCHASE_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID,
+            </if>
+            <if test="purchaseOrderNo != null">
+                PURCHASE_ORDER_NO,
+            </if>
+            <if test="batchId != null">
+                BATCH_ID,
+            </if>
+            <if test="purchaseOrderDate != null">
+                PURCHASE_ORDER_DATE,
+            </if>
+            <if test="supplierUnitId != null">
+                SUPPLIER_UNIT_ID,
+            </if>
+            <if test="purchasingOrganizationId != null">
+                PURCHASING_ORGANIZATION_ID,
+            </if>
+            <if test="purchaseOrderBuyer != null">
+                PURCHASE_ORDER_BUYER,
+            </if>
+            <if test="puchaseOrderMaterialNumber != null">
+                PUCHASE_ORDER_MATERIAL_NUMBER,
+            </if>
+            <if test="receiveUnitId != null">
+                RECEIVE_UNIT_ID,
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                PUCHASE_ORDER_DELIVERY_DATE,
+            </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="purchaseOrderId != null">
+                #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderNo != null">
+                #{purchaseOrderNo,jdbcType=VARCHAR},
+            </if>
+            <if test="batchId != null">
+                #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderDate != null">
+                #{purchaseOrderDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="supplierUnitId != null">
+                #{supplierUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchasingOrganizationId != null">
+                #{purchasingOrganizationId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderBuyer != null">
+                #{purchaseOrderBuyer,jdbcType=VARCHAR},
+            </if>
+            <if test="puchaseOrderMaterialNumber != null">
+                #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+            </if>
+            <if test="receiveUnitId != null">
+                #{receiveUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
+        update AMS_PURCHASE_ORDER
+        set PURCHASE_ORDER_NO             = #{purchaseOrderNo,jdbcType=VARCHAR},
+            BATCH_ID                      = #{batchId,jdbcType=DECIMAL},
+            PURCHASE_ORDER_DATE           = #{purchaseOrderDate,jdbcType=TIMESTAMP},
+            SUPPLIER_UNIT_ID              = #{supplierUnitId,jdbcType=DECIMAL},
+            PURCHASING_ORGANIZATION_ID    = #{purchasingOrganizationId,jdbcType=DECIMAL},
+            PURCHASE_ORDER_BUYER          = #{purchaseOrderBuyer,jdbcType=VARCHAR},
+            PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+            RECEIVE_UNIT_ID               = #{receiveUnitId,jdbcType=DECIMAL},
+            PUCHASE_ORDER_DELIVERY_DATE   = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+            INSERT_USERNAME               = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                   = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME               = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                   = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK          = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED                       = #{deleted,jdbcType=DECIMAL}
+        where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
+        update AMS_PURCHASE_ORDER
+        <set>
+            <if test="purchaseOrderNo != null">
+                PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
+            </if>
+            <if test="batchId != null">
+                BATCH_ID = #{batchId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderDate != null">
+                PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="supplierUnitId != null">
+                SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchasingOrganizationId != null">
+                PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderBuyer != null">
+                PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
+            </if>
+            <if test="puchaseOrderMaterialNumber != null">
+                PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+            </if>
+            <if test="receiveUnitId != null">
+                RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PURCHASE_ORDER_ID = #{purchaseOrderId,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 AMS_PURCHASE_ORDER
+        (PURCHASE_ORDER_ID,
+        PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE,
+        SUPPLIER_UNIT_ID, PURCHASING_ORGANIZATION_ID,
+        PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER,
+        RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.purchaseOrderId,jdbcType=DECIMAL},
+        #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.batchId,jdbcType=DECIMAL},
+        #{item.purchaseOrderDate,jdbcType=TIMESTAMP},
+        #{item.supplierUnitId,jdbcType=DECIMAL}, #{item.purchasingOrganizationId,jdbcType=DECIMAL},
+        #{item.purchaseOrderBuyer,jdbcType=VARCHAR}, #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+        #{item.receiveUnitId,jdbcType=DECIMAL}, #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+        #{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 AMS_PURCHASE_ORDER
+        set
+        PURCHASE_ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderNo,jdbcType=VARCHAR}
+        </foreach>
+        ,BATCH_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,SUPPLIER_UNIT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierUnitId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASING_ORGANIZATION_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchasingOrganizationId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_BUYER=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderBuyer,jdbcType=VARCHAR}
+        </foreach>
+        ,PUCHASE_ORDER_MATERIAL_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL}
+        </foreach>
+        ,RECEIVE_UNIT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.receiveUnitId,jdbcType=DECIMAL}
+        </foreach>
+        ,PUCHASE_ORDER_DELIVERY_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where PURCHASE_ORDER_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.purchaseOrderId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from AMS_PURCHASE_ORDER
+        where PURCHASE_ORDER_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 通过物资唯一编码和外轮船名得到批次 -->
+    <select id="getBatchId" parameterType="java.util.Map" resultType="DECIMAL">
+        SELECT db.BATCH_ID
+        FROM DIL_BATCH db
+                 LEFT JOIN RMS_MATERIAL rm
+                           ON db.MATERIAL_ID = rm.MATERIAL_ID
+        WHERE db.RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
+          AND rm.MATERIAL_CODE = #{materialCode}
+    </select>
+
+    <!-- 通过供应商代码得到供应商id -->
+    <select id="getSupplierId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT rs.SUPPLIER_ID
+        FROM RMS_SUPPLIER rs
+        WHERE rs.SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
+    </select>
+
+  <!-- 通过名称查询收货单位 -->
+  <select id="getShipperId" parameterType="java.lang.String" resultType="DECIMAL">
+    SELECT rs.SHIPPER_ID
+    FROM RMS_SHIPPER rs
+    WHERE rs.SHIPPER_NAME = #{receiveUnit}
+  </select>
+</mapper>

+ 529 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -0,0 +1,529 @@
+<?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.RmsMaterialMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterial">
+        <id column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
+        <result column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId"/>
+        <result column="UNIT_OF_MEASURE_ID" jdbcType="DECIMAL" property="unitOfMeasureId"/>
+        <result column="MATERIAL_CODE" jdbcType="VARCHAR" property="materialCode"/>
+        <result column="MATERIAL_NAME" jdbcType="VARCHAR" property="materialName"/>
+        <result column="MATERIAL_SPECIFICATION" jdbcType="VARCHAR" property="materialSpecification"/>
+        <result column="MATERIAL_MODEL" jdbcType="VARCHAR" property="materialModel"/>
+        <result column="MATERIAL_LENGTH" jdbcType="DECIMAL" property="materialLength"/>
+        <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="EAS_MATERIAL_ID" jdbcType="DECIMAL" property="easMaterialId"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID, MATERIAL_CODE, MATERIAL_NAME,
+    MATERIAL_SPECIFICATION, MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME, INSERT_TIME, 
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.MATERIAL_ID, t.MATERIAL_TYPE_ID, t.UNIT_OF_MEASURE_ID, t.MATERIAL_CODE, t.MATERIAL_NAME,
+    t.MATERIAL_SPECIFICATION, t.MATERIAL_MODEL, t.MATERIAL_LENGTH, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_MATERIAL_ID, 
+    t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM RMS_MATERIAL
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM RMS_MATERIAL t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="materialTypeId != null">
+                and MATERIAL_TYPE_ID = #{materialTypeId}
+            </if>
+            <if test="unitOfMeasureId != null">
+                and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and MATERIAL_CODE = #{materialCode}
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and MATERIAL_NAME = #{materialName}
+            </if>
+            <if test="materialSpecification != null and materialSpecification != ''">
+                and MATERIAL_SPECIFICATION = #{materialSpecification}
+            </if>
+            <if test="materialModel != null and materialModel != ''">
+                and MATERIAL_MODEL = #{materialModel}
+            </if>
+            <if test="materialLength != null">
+                and MATERIAL_LENGTH = #{materialLength}
+            </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="easMaterialId != null">
+                and EAS_MATERIAL_ID = #{easMaterialId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="materialTypeId != null">
+                and MATERIAL_TYPE_ID = #{materialTypeId}
+            </if>
+            <if test="unitOfMeasureId != null">
+                and UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
+            </if>
+            <if test="materialCode != null and materialCode != ''">
+                and MATERIAL_CODE LIKE '%${materialCode}%'
+            </if>
+            <if test="materialName != null and materialName != ''">
+                and MATERIAL_NAME LIKE '%${materialName}%'
+            </if>
+            <if test="materialSpecification != null and materialSpecification != ''">
+                and MATERIAL_SPECIFICATION LIKE '%${materialSpecification}%'
+            </if>
+            <if test="materialModel != null and materialModel != ''">
+                and MATERIAL_MODEL LIKE '%${materialModel}%'
+            </if>
+            <if test="materialLength != null">
+                and MATERIAL_LENGTH = #{materialLength}
+            </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="easMaterialId != null">
+                and EAS_MATERIAL_ID = #{easMaterialId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from RMS_MATERIAL
+        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from RMS_MATERIAL
+        where 1!=1
+        <if test="materialTypeId != null">
+            or MATERIAL_TYPE_ID = #{materialTypeId}
+        </if>
+        <if test="unitOfMeasureId != null">
+            or UNIT_OF_MEASURE_ID = #{unitOfMeasureId}
+        </if>
+        <if test="materialCode != null and materialCode != ''">
+            or MATERIAL_CODE = #{materialCode}
+        </if>
+        <if test="materialName != null and materialName != ''">
+            or MATERIAL_NAME = #{materialName}
+        </if>
+        <if test="materialSpecification != null and materialSpecification != ''">
+            or MATERIAL_SPECIFICATION = #{materialSpecification}
+        </if>
+        <if test="materialModel != null and materialModel != ''">
+            or MATERIAL_MODEL = #{materialModel}
+        </if>
+        <if test="materialLength != null">
+            or MATERIAL_LENGTH = #{materialLength}
+        </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="easMaterialId != null">
+            or EAS_MATERIAL_ID = #{easMaterialId}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterial">
+        insert into RMS_MATERIAL (MATERIAL_ID, MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID,
+                                  MATERIAL_CODE, MATERIAL_NAME, MATERIAL_SPECIFICATION,
+                                  MATERIAL_MODEL, MATERIAL_LENGTH, INSERT_USERNAME,
+                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                  INSERT_UPDATE_REMARK, EAS_MATERIAL_ID, DELETED)
+        values (#{materialId,jdbcType=DECIMAL}, #{materialTypeId,jdbcType=DECIMAL}, #{unitOfMeasureId,jdbcType=DECIMAL},
+                #{materialCode,jdbcType=VARCHAR}, #{materialName,jdbcType=VARCHAR},
+                #{materialSpecification,jdbcType=VARCHAR},
+                #{materialModel,jdbcType=VARCHAR}, #{materialLength,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=DECIMAL}, #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
+        insert into RMS_MATERIAL
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
+            <if test="materialTypeId != null">
+                MATERIAL_TYPE_ID,
+            </if>
+            <if test="unitOfMeasureId != null">
+                UNIT_OF_MEASURE_ID,
+            </if>
+            <if test="materialCode != null">
+                MATERIAL_CODE,
+            </if>
+            <if test="materialName != null">
+                MATERIAL_NAME,
+            </if>
+            <if test="materialSpecification != null">
+                MATERIAL_SPECIFICATION,
+            </if>
+            <if test="materialModel != null">
+                MATERIAL_MODEL,
+            </if>
+            <if test="materialLength != null">
+                MATERIAL_LENGTH,
+            </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="easMaterialId != null">
+                EAS_MATERIAL_ID,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="materialTypeId != null">
+                #{materialTypeId,jdbcType=DECIMAL},
+            </if>
+            <if test="unitOfMeasureId != null">
+                #{unitOfMeasureId,jdbcType=DECIMAL},
+            </if>
+            <if test="materialCode != null">
+                #{materialCode,jdbcType=VARCHAR},
+            </if>
+            <if test="materialName != null">
+                #{materialName,jdbcType=VARCHAR},
+            </if>
+            <if test="materialSpecification != null">
+                #{materialSpecification,jdbcType=VARCHAR},
+            </if>
+            <if test="materialModel != null">
+                #{materialModel,jdbcType=VARCHAR},
+            </if>
+            <if test="materialLength != null">
+                #{materialLength,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="easMaterialId != null">
+                #{easMaterialId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsMaterial">
+        update RMS_MATERIAL
+        set MATERIAL_TYPE_ID       = #{materialTypeId,jdbcType=DECIMAL},
+            UNIT_OF_MEASURE_ID     = #{unitOfMeasureId,jdbcType=DECIMAL},
+            MATERIAL_CODE          = #{materialCode,jdbcType=VARCHAR},
+            MATERIAL_NAME          = #{materialName,jdbcType=VARCHAR},
+            MATERIAL_SPECIFICATION = #{materialSpecification,jdbcType=VARCHAR},
+            MATERIAL_MODEL         = #{materialModel,jdbcType=VARCHAR},
+            MATERIAL_LENGTH        = #{materialLength,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},
+            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=DECIMAL},
+            DELETED                = #{deleted,jdbcType=DECIMAL}
+        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
+        update RMS_MATERIAL
+        <set>
+            <if test="materialTypeId != null">
+                MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL},
+            </if>
+            <if test="unitOfMeasureId != null">
+                UNIT_OF_MEASURE_ID = #{unitOfMeasureId,jdbcType=DECIMAL},
+            </if>
+            <if test="materialCode != null">
+                MATERIAL_CODE = #{materialCode,jdbcType=VARCHAR},
+            </if>
+            <if test="materialName != null">
+                MATERIAL_NAME = #{materialName,jdbcType=VARCHAR},
+            </if>
+            <if test="materialSpecification != null">
+                MATERIAL_SPECIFICATION = #{materialSpecification,jdbcType=VARCHAR},
+            </if>
+            <if test="materialModel != null">
+                MATERIAL_MODEL = #{materialModel,jdbcType=VARCHAR},
+            </if>
+            <if test="materialLength != null">
+                MATERIAL_LENGTH = #{materialLength,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="easMaterialId != null">
+                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into RMS_MATERIAL
+        (MATERIAL_ID,
+        MATERIAL_TYPE_ID, UNIT_OF_MEASURE_ID,
+        MATERIAL_CODE, MATERIAL_NAME, MATERIAL_SPECIFICATION,
+        MATERIAL_MODEL, MATERIAL_LENGTH,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK, EAS_MATERIAL_ID,
+        DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.materialId,jdbcType=DECIMAL},
+        #{item.materialTypeId,jdbcType=DECIMAL}, #{item.unitOfMeasureId,jdbcType=DECIMAL},
+        #{item.materialCode,jdbcType=VARCHAR}, #{item.materialName,jdbcType=VARCHAR},
+        #{item.materialSpecification,jdbcType=VARCHAR},
+        #{item.materialModel,jdbcType=VARCHAR}, #{item.materialLength,jdbcType=DECIMAL},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=DECIMAL},
+        #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update RMS_MATERIAL
+        set
+        MATERIAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
+        ,MATERIAL_TYPE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
+        </foreach>
+        ,UNIT_OF_MEASURE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.unitOfMeasureId,jdbcType=DECIMAL}
+        </foreach>
+        ,MATERIAL_CODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialCode,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_NAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialName,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_SPECIFICATION=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialSpecification,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_MODEL=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialModel,jdbcType=VARCHAR}
+        </foreach>
+        ,MATERIAL_LENGTH=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.materialLength,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,EAS_MATERIAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=DECIMAL}
+        </foreach>
+        ,DELETED=
+        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where MATERIAL_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from RMS_MATERIAL
+        where MATERIAL_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 展示物资信息 -->
+    <select id="getMaterialList" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_CODE AS "materialCode",
+        RM.MATERIAL_NAME AS "materialName",
+        RMT.MATERIAL_TYPE_NAME AS "materialTypeName",
+        RMT.MATERIAL_TYPE_STATUS AS "materialTypeStatus",
+        RUOM.UNIT_OF_MEASURE_NAME AS "unitOfMeasureName"
+        FROM RMS_MATERIAL RM
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RM.MATERIAL_TYPE_ID = RMT.MATERIAL_TYPE_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+        ON RM.UNIT_OF_MEASURE_ID = RUOM.UNIT_OF_MEASURE_ID
+        )
+        <where>
+            <if test="materialCode!= null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="," close=")">
+                    "materialCode" in #{item}
+                </foreach>
+            </if>
+            <if test="materialName!= null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="," close=")">
+                    "materialName" in #{item}
+                </foreach>
+            </if>
+            <if test="materialTypeName!= null">
+                and
+                <foreach collection="materialTypeName" item="item" open="(" separator="," close=")">
+                    "materialTypeName" in #{item}
+                </foreach>
+            </if>
+            <if test="materialTypeStatus!= null">
+                and
+                <foreach collection="materialTypeStatus" item="item" open="(" separator="," close=")">
+                    "materialTypeStatus" in #{item}
+                </foreach>
+            </if>
+            <if test="unitOfMeasureName!= null">
+                and
+                <foreach collection="unitOfMeasureName" item="item" open="(" separator="," close=")">
+                    "unitOfMeasureName" in #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+</mapper>

+ 345 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsMaterialTypeMapper.xml

@@ -0,0 +1,345 @@
+<?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.RmsMaterialTypeMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsMaterialType">
+    <id column="MATERIAL_TYPE_ID" jdbcType="DECIMAL" property="materialTypeId" />
+    <result column="MATERIAL_TYPE_NAME" jdbcType="VARCHAR" property="materialTypeName" />
+    <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
+    <result column="MATERIAL_PACKING_TYPE" jdbcType="VARCHAR" property="materialPackingType" />
+    <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">
+    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_PACKING_TYPE, 
+    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 RMS_MATERIAL_TYPE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_MATERIAL_TYPE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="materialTypeId != null">
+        and MATERIAL_TYPE_ID = #{materialTypeId}
+      </if>
+      <if test="materialTypeName != null and materialTypeName != ''">
+        and MATERIAL_TYPE_NAME = #{materialTypeName}
+      </if>
+      <if test="materialUnit != null and materialUnit != ''">
+        and MATERIAL_UNIT = #{materialUnit}
+      </if>
+      <if test="materialOrder != null">
+        and MATERIAL_ORDER = #{materialOrder}
+      </if>
+      <if test="materialPackingType != null and materialPackingType != ''">
+        and MATERIAL_PACKING_TYPE = #{materialPackingType}
+      </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="materialTypeId != null">
+        and MATERIAL_TYPE_ID = #{materialTypeId}
+      </if>
+      <if test="materialTypeName != null and materialTypeName != ''">
+        and MATERIAL_TYPE_NAME LIKE '%${materialTypeName}%'
+      </if>
+      <if test="materialUnit != null and materialUnit != ''">
+        and MATERIAL_UNIT LIKE '%${materialUnit}%'
+      </if>
+      <if test="materialOrder != null">
+        and MATERIAL_ORDER = #{materialOrder}
+      </if>
+      <if test="materialPackingType != null and materialPackingType != ''">
+        and MATERIAL_PACKING_TYPE LIKE '%${materialPackingType}%'
+      </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.lang.Short">
+    delete from RMS_MATERIAL_TYPE
+    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_MATERIAL_TYPE
+    where 1!=1 
+      <if test="materialTypeName != null and materialTypeName != ''">
+        or MATERIAL_TYPE_NAME = #{materialTypeName}
+      </if>
+      <if test="materialUnit != null and materialUnit != ''">
+        or MATERIAL_UNIT = #{materialUnit}
+      </if>
+      <if test="materialOrder != null">
+        or MATERIAL_ORDER = #{materialOrder}
+      </if>
+      <if test="materialPackingType != null and materialPackingType != ''">
+        or MATERIAL_PACKING_TYPE = #{materialPackingType}
+      </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.RmsMaterialType">
+    insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, 
+      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR}, 
+      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialPackingType,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.RmsMaterialType">
+    insert into RMS_MATERIAL_TYPE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="materialTypeId != null">
+        MATERIAL_TYPE_ID,
+      </if>
+      <if test="materialTypeName != null">
+        MATERIAL_TYPE_NAME,
+      </if>
+      <if test="materialUnit != null">
+        MATERIAL_UNIT,
+      </if>
+      <if test="materialOrder != null">
+        MATERIAL_ORDER,
+      </if>
+      <if test="materialPackingType != null">
+        MATERIAL_PACKING_TYPE,
+      </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="materialTypeId != null">
+        #{materialTypeId,jdbcType=DECIMAL},
+      </if>
+      <if test="materialTypeName != null">
+        #{materialTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialUnit != null">
+        #{materialUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="materialOrder != null">
+        #{materialOrder,jdbcType=DECIMAL},
+      </if>
+      <if test="materialPackingType != null">
+        #{materialPackingType,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.RmsMaterialType">
+    update RMS_MATERIAL_TYPE
+    set MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
+      MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
+      MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+      MATERIAL_PACKING_TYPE = #{materialPackingType,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 MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsMaterialType">
+    update RMS_MATERIAL_TYPE
+    <set>
+      <if test="materialTypeName != null">
+        MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialUnit != null">
+        MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
+      </if>
+      <if test="materialOrder != null">
+        MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
+      </if>
+      <if test="materialPackingType != null">
+        MATERIAL_PACKING_TYPE = #{materialPackingType,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 MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where MATERIAL_TYPE_ID = #{materialTypeId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_MATERIAL_TYPE 
+      (MATERIAL_TYPE_ID, 
+      MATERIAL_TYPE_NAME, MATERIAL_UNIT, 
+      MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.materialTypeId,jdbcType=DECIMAL}, 
+      #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialUnit,jdbcType=VARCHAR}, 
+      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialPackingType,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 RMS_MATERIAL_TYPE
+     set
+       MATERIAL_TYPE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeId,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_TYPE_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_UNIT=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialUnit,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_ORDER=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
+       </foreach>
+       ,MATERIAL_PACKING_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialPackingType,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where MATERIAL_TYPE_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.materialTypeId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_MATERIAL_TYPE
+    where MATERIAL_TYPE_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+  
+</mapper>

+ 509 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsPersonnelMapper.xml

@@ -0,0 +1,509 @@
+<?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.RmsPersonnelMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsPersonnel">
+        <id column="PERSONNEL_ID" jdbcType="DECIMAL" property="personnelId"/>
+        <result column="PERSONNEL_JOB_NUMBER" jdbcType="VARCHAR" property="personnelJobNumber"/>
+        <result column="PERSONNEL_POST" jdbcType="VARCHAR" property="personnelPost"/>
+        <result column="PERSONNEL_NAME" jdbcType="VARCHAR" property="personnelName"/>
+        <result column="PERSONNEL_DEPARTMENT_ID" jdbcType="DECIMAL" property="personnelDepartmentId"/>
+        <result column="PERSONNEL_WORKSHOPID" jdbcType="DECIMAL" property="personnelWorkshopid"/>
+        <result column="PERSONNEL_SHIFTS" jdbcType="VARCHAR" property="personnelShifts"/>
+        <result column="PERSONNEL_TEAM" jdbcType="VARCHAR" property="personnelTeam"/>
+        <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="EAS_PERSONNEL_ID" jdbcType="DECIMAL" property="easPersonnelId"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+    </resultMap>
+    <sql id="columns">
+        PERSONNEL_ID, PERSONNEL_JOB_NUMBER, PERSONNEL_POST, PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID,
+    PERSONNEL_WORKSHOPID, PERSONNEL_SHIFTS, PERSONNEL_TEAM, INSERT_USERNAME, INSERT_TIME, 
+    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_PERSONNEL_ID, DELETED
+    </sql>
+    <sql id="columns_alias">
+        t.PERSONNEL_ID, t.PERSONNEL_JOB_NUMBER, t.PERSONNEL_POST, t.PERSONNEL_NAME, t.PERSONNEL_DEPARTMENT_ID,
+    t.PERSONNEL_WORKSHOPID, t.PERSONNEL_SHIFTS, t.PERSONNEL_TEAM, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_PERSONNEL_ID, 
+    t.DELETED
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM RMS_PERSONNEL
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM RMS_PERSONNEL t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="personnelId != null">
+                and PERSONNEL_ID = #{personnelId}
+            </if>
+            <if test="personnelJobNumber != null and personnelJobNumber != ''">
+                and PERSONNEL_JOB_NUMBER = #{personnelJobNumber}
+            </if>
+            <if test="personnelPost != null and personnelPost != ''">
+                and PERSONNEL_POST = #{personnelPost}
+            </if>
+            <if test="personnelName != null and personnelName != ''">
+                and PERSONNEL_NAME = #{personnelName}
+            </if>
+            <if test="personnelDepartmentId != null">
+                and PERSONNEL_DEPARTMENT_ID = #{personnelDepartmentId}
+            </if>
+            <if test="personnelWorkshopid != null">
+                and PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
+            </if>
+            <if test="personnelShifts != null and personnelShifts != ''">
+                and PERSONNEL_SHIFTS = #{personnelShifts}
+            </if>
+            <if test="personnelTeam != null and personnelTeam != ''">
+                and PERSONNEL_TEAM = #{personnelTeam}
+            </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="easPersonnelId != null">
+                and EAS_PERSONNEL_ID = #{easPersonnelId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="personnelId != null">
+                and PERSONNEL_ID = #{personnelId}
+            </if>
+            <if test="personnelJobNumber != null and personnelJobNumber != ''">
+                and PERSONNEL_JOB_NUMBER LIKE '%${personnelJobNumber}%'
+            </if>
+            <if test="personnelPost != null and personnelPost != ''">
+                and PERSONNEL_POST LIKE '%${personnelPost}%'
+            </if>
+            <if test="personnelName != null and personnelName != ''">
+                and PERSONNEL_NAME LIKE '%${personnelName}%'
+            </if>
+            <if test="personnelDepartmentId != null">
+                and PERSONNEL_DEPARTMENT_ID = #{personnelDepartmentId}
+            </if>
+            <if test="personnelWorkshopid != null">
+                and PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
+            </if>
+            <if test="personnelShifts != null and personnelShifts != ''">
+                and PERSONNEL_SHIFTS LIKE '%${personnelShifts}%'
+            </if>
+            <if test="personnelTeam != null and personnelTeam != ''">
+                and PERSONNEL_TEAM LIKE '%${personnelTeam}%'
+            </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="easPersonnelId != null">
+                and EAS_PERSONNEL_ID = #{easPersonnelId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from RMS_PERSONNEL
+        where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from RMS_PERSONNEL
+        where 1!=1
+        <if test="personnelJobNumber != null and personnelJobNumber != ''">
+            or PERSONNEL_JOB_NUMBER = #{personnelJobNumber}
+        </if>
+        <if test="personnelPost != null and personnelPost != ''">
+            or PERSONNEL_POST = #{personnelPost}
+        </if>
+        <if test="personnelName != null and personnelName != ''">
+            or PERSONNEL_NAME = #{personnelName}
+        </if>
+        <if test="personnelDepartmentId != null">
+            or PERSONNEL_DEPARTMENT_ID = #{personnelDepartmentId}
+        </if>
+        <if test="personnelWorkshopid != null">
+            or PERSONNEL_WORKSHOPID = #{personnelWorkshopid}
+        </if>
+        <if test="personnelShifts != null and personnelShifts != ''">
+            or PERSONNEL_SHIFTS = #{personnelShifts}
+        </if>
+        <if test="personnelTeam != null and personnelTeam != ''">
+            or PERSONNEL_TEAM = #{personnelTeam}
+        </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="easPersonnelId != null">
+            or EAS_PERSONNEL_ID = #{easPersonnelId}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsPersonnel">
+        insert into RMS_PERSONNEL (PERSONNEL_ID, PERSONNEL_JOB_NUMBER,
+                                   PERSONNEL_POST, PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID,
+                                   PERSONNEL_WORKSHOPID, PERSONNEL_SHIFTS, PERSONNEL_TEAM,
+                                   INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                   UPDATE_TIME, INSERT_UPDATE_REMARK, EAS_PERSONNEL_ID,
+                                   DELETED)
+        values (#{personnelId,jdbcType=DECIMAL}, #{personnelJobNumber,jdbcType=VARCHAR},
+                #{personnelPost,jdbcType=VARCHAR}, #{personnelName,jdbcType=VARCHAR},
+                #{personnelDepartmentId,jdbcType=DECIMAL},
+                #{personnelWorkshopid,jdbcType=DECIMAL}, #{personnelShifts,jdbcType=VARCHAR},
+                #{personnelTeam,jdbcType=VARCHAR},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{easPersonnelId,jdbcType=DECIMAL},
+                #{deleted,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsPersonnel">
+        insert into RMS_PERSONNEL
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">
+                PERSONNEL_ID,
+            </if>
+            <if test="personnelJobNumber != null">
+                PERSONNEL_JOB_NUMBER,
+            </if>
+            <if test="personnelPost != null">
+                PERSONNEL_POST,
+            </if>
+            <if test="personnelName != null">
+                PERSONNEL_NAME,
+            </if>
+            <if test="personnelDepartmentId != null">
+                PERSONNEL_DEPARTMENT_ID,
+            </if>
+            <if test="personnelWorkshopid != null">
+                PERSONNEL_WORKSHOPID,
+            </if>
+            <if test="personnelShifts != null">
+                PERSONNEL_SHIFTS,
+            </if>
+            <if test="personnelTeam != null">
+                PERSONNEL_TEAM,
+            </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="easPersonnelId != null">
+                EAS_PERSONNEL_ID,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="personnelId != null">
+                #{personnelId,jdbcType=DECIMAL},
+            </if>
+            <if test="personnelJobNumber != null">
+                #{personnelJobNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelPost != null">
+                #{personnelPost,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelName != null">
+                #{personnelName,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelDepartmentId != null">
+                #{personnelDepartmentId,jdbcType=DECIMAL},
+            </if>
+            <if test="personnelWorkshopid != null">
+                #{personnelWorkshopid,jdbcType=DECIMAL},
+            </if>
+            <if test="personnelShifts != null">
+                #{personnelShifts,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelTeam != null">
+                #{personnelTeam,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="easPersonnelId != null">
+                #{easPersonnelId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsPersonnel">
+        update RMS_PERSONNEL
+        set PERSONNEL_JOB_NUMBER    = #{personnelJobNumber,jdbcType=VARCHAR},
+            PERSONNEL_POST          = #{personnelPost,jdbcType=VARCHAR},
+            PERSONNEL_NAME          = #{personnelName,jdbcType=VARCHAR},
+            PERSONNEL_DEPARTMENT_ID = #{personnelDepartmentId,jdbcType=DECIMAL},
+            PERSONNEL_WORKSHOPID    = #{personnelWorkshopid,jdbcType=DECIMAL},
+            PERSONNEL_SHIFTS        = #{personnelShifts,jdbcType=VARCHAR},
+            PERSONNEL_TEAM          = #{personnelTeam,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},
+            EAS_PERSONNEL_ID        = #{easPersonnelId,jdbcType=DECIMAL},
+            DELETED                 = #{deleted,jdbcType=DECIMAL}
+        where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsPersonnel">
+        update RMS_PERSONNEL
+        <set>
+            <if test="personnelJobNumber != null">
+                PERSONNEL_JOB_NUMBER = #{personnelJobNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelPost != null">
+                PERSONNEL_POST = #{personnelPost,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelName != null">
+                PERSONNEL_NAME = #{personnelName,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelDepartmentId != null">
+                PERSONNEL_DEPARTMENT_ID = #{personnelDepartmentId,jdbcType=DECIMAL},
+            </if>
+            <if test="personnelWorkshopid != null">
+                PERSONNEL_WORKSHOPID = #{personnelWorkshopid,jdbcType=DECIMAL},
+            </if>
+            <if test="personnelShifts != null">
+                PERSONNEL_SHIFTS = #{personnelShifts,jdbcType=VARCHAR},
+            </if>
+            <if test="personnelTeam != null">
+                PERSONNEL_TEAM = #{personnelTeam,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="easPersonnelId != null">
+                EAS_PERSONNEL_ID = #{easPersonnelId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where PERSONNEL_ID = #{personnelId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into RMS_PERSONNEL
+        (PERSONNEL_ID,
+        PERSONNEL_JOB_NUMBER, PERSONNEL_POST,
+        PERSONNEL_NAME, PERSONNEL_DEPARTMENT_ID,
+        PERSONNEL_WORKSHOPID, PERSONNEL_SHIFTS,
+        PERSONNEL_TEAM, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        EAS_PERSONNEL_ID, DELETED)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.personnelId,jdbcType=DECIMAL},
+        #{item.personnelJobNumber,jdbcType=VARCHAR}, #{item.personnelPost,jdbcType=VARCHAR},
+        #{item.personnelName,jdbcType=VARCHAR}, #{item.personnelDepartmentId,jdbcType=DECIMAL},
+        #{item.personnelWorkshopid,jdbcType=DECIMAL}, #{item.personnelShifts,jdbcType=VARCHAR},
+        #{item.personnelTeam,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.easPersonnelId,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update RMS_PERSONNEL
+        set
+        PERSONNEL_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelId,jdbcType=DECIMAL}
+        </foreach>
+        ,PERSONNEL_JOB_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelJobNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,PERSONNEL_POST=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelPost,jdbcType=VARCHAR}
+        </foreach>
+        ,PERSONNEL_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelName,jdbcType=VARCHAR}
+        </foreach>
+        ,PERSONNEL_DEPARTMENT_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelDepartmentId,jdbcType=DECIMAL}
+        </foreach>
+        ,PERSONNEL_WORKSHOPID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelWorkshopid,jdbcType=DECIMAL}
+        </foreach>
+        ,PERSONNEL_SHIFTS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelShifts,jdbcType=VARCHAR}
+        </foreach>
+        ,PERSONNEL_TEAM=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.personnelTeam,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,EAS_PERSONNEL_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.easPersonnelId,jdbcType=DECIMAL}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case PERSONNEL_ID" close="end">
+            when #{item.personnelId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        where PERSONNEL_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.personnelId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from RMS_PERSONNEL
+        where PERSONNEL_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 得到人员信息下拉 -->
+    <select id="getPersonnelList" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RP.PERSONNEL_JOB_NUMBER AS "personnelJobNumber",
+        RP.PERSONNEL_NAME AS "personnelName"
+        FROM RMS_PERSONNEL RP
+        WHERE RP.DELETED != 0
+        )
+        <where>
+            <if test="personnelJobNumber!= null">
+                and
+                <foreach collection="personnelJobNumber" item="item" open="(" separator="," close=")">
+                    "personnelJobNumber" in #{item}
+                </foreach>
+            </if>
+            <if test="personnelName!= null">
+                and
+                <foreach collection="personnelName" item="item" open="(" separator="," close=")">
+                    "personnelName" in #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

+ 962 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

@@ -0,0 +1,962 @@
+<?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.RmsSupplierMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsSupplier">
+        <id column="SUPPLIER_ID" jdbcType="DECIMAL" property="supplierId"/>
+        <result column="SUPPLIER_NAME" jdbcType="VARCHAR" property="supplierName"/>
+        <result column="SUPPLIER_ABBREVIATION" jdbcType="VARCHAR" property="supplierAbbreviation"/>
+        <result column="SUPPLIER_ADDRESS" jdbcType="VARCHAR" property="supplierAddress"/>
+        <result column="SUPPLIER_LEGAL_REPRESENTATIVE" jdbcType="VARCHAR" property="supplierLegalRepresentative"/>
+        <result column="SUPPLIER_REGISTER_NO" jdbcType="VARCHAR" property="supplierRegisterNo"/>
+        <result column="SUPPLIER_AGENT" jdbcType="VARCHAR" property="supplierAgent"/>
+        <result column="SUPPLIER_CONTACT_NUMBER" jdbcType="VARCHAR" property="supplierContactNumber"/>
+        <result column="SUPPLIER_FAX" jdbcType="VARCHAR" property="supplierFax"/>
+        <result column="SUPPLIER_ACCOUNT" jdbcType="VARCHAR" property="supplierAccount"/>
+        <result column="SUPPLIER_ACCOUNT_BLANK" jdbcType="VARCHAR" property="supplierAccountBlank"/>
+        <result column="SUPPLIER_DUTY_PARAGRAPH" jdbcType="VARCHAR" property="supplierDutyParagraph"/>
+        <result column="SUPPLIER_POSTAL_CODE" jdbcType="VARCHAR" property="supplierPostalCode"/>
+        <result column="SUPPLIER_REGISTER_CAPITAL" jdbcType="VARCHAR" property="supplierRegisterCapital"/>
+        <result column="SUPPLIERBUSINESS_SCOPE" jdbcType="VARCHAR" property="supplierbusinessScope"/>
+        <result column="SUPPLIER_COMPANY_STATUS" jdbcType="VARCHAR" property="supplierCompanyStatus"/>
+        <result column="SUPPLIER_OPERATION_PERIOD" jdbcType="VARCHAR" property="supplierOperationPeriod"/>
+        <result column="SUPPLIER_REGISTER_DATE" jdbcType="TIMESTAMP" property="supplierRegisterDate"/>
+        <result column="SUPPLIER_REGISTER_ORGANIZATION" jdbcType="VARCHAR" property="supplierRegisterOrganization"/>
+        <result column="SUPPLIER_REGISTER_APTITUDES" jdbcType="VARCHAR" property="supplierRegisterAptitudes"/>
+        <result column="SUPPLIER_CREDENTIAL" jdbcType="VARCHAR" property="supplierCredential"/>
+        <result column="SUPPLIER_CONTACTS_NAME" jdbcType="VARCHAR" property="supplierContactsName"/>
+        <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="EAS_SUPPLIER_ID" jdbcType="DECIMAL" property="easSupplierId"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <result column="SUPPLIER_BUSINESS_LICENSE" jdbcType="BLOB" property="supplierBusinessLicense"/>
+        <result column="SUPPLIER_BUSINESS_ABLELICENSE" jdbcType="BLOB" property="supplierBusinessAblelicense"/>
+    </resultMap>
+    <sql id="columns">
+        SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION, SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+    SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX, SUPPLIER_ACCOUNT, 
+    SUPPLIER_ACCOUNT_BLANK, SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE, SUPPLIER_REGISTER_CAPITAL, 
+    SUPPLIERBUSINESS_SCOPE, SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD, SUPPLIER_REGISTER_DATE, 
+    SUPPLIER_REGISTER_ORGANIZATION, SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL, 
+    SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE, SUPPLIER_BUSINESS_ABLELICENSE
+    </sql>
+    <sql id="columns_alias">
+        t.SUPPLIER_ID, t.SUPPLIER_NAME, t.SUPPLIER_ABBREVIATION, t.SUPPLIER_ADDRESS, t.SUPPLIER_LEGAL_REPRESENTATIVE,
+    t.SUPPLIER_REGISTER_NO, t.SUPPLIER_AGENT, t.SUPPLIER_CONTACT_NUMBER, t.SUPPLIER_FAX, 
+    t.SUPPLIER_ACCOUNT, t.SUPPLIER_ACCOUNT_BLANK, t.SUPPLIER_DUTY_PARAGRAPH, t.SUPPLIER_POSTAL_CODE, 
+    t.SUPPLIER_REGISTER_CAPITAL, t.SUPPLIERBUSINESS_SCOPE, t.SUPPLIER_COMPANY_STATUS, 
+    t.SUPPLIER_OPERATION_PERIOD, t.SUPPLIER_REGISTER_DATE, t.SUPPLIER_REGISTER_ORGANIZATION, 
+    t.SUPPLIER_REGISTER_APTITUDES, t.SUPPLIER_CREDENTIAL, t.SUPPLIER_CONTACTS_NAME, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.EAS_SUPPLIER_ID, 
+    t.DELETED, t.SUPPLIER_BUSINESS_LICENSE, t.SUPPLIER_BUSINESS_ABLELICENSE
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM RMS_SUPPLIER
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM RMS_SUPPLIER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="supplierId != null">
+                and SUPPLIER_ID = #{supplierId}
+            </if>
+            <if test="supplierName != null and supplierName != ''">
+                and SUPPLIER_NAME = #{supplierName}
+            </if>
+            <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
+                and SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
+            </if>
+            <if test="supplierAddress != null and supplierAddress != ''">
+                and SUPPLIER_ADDRESS = #{supplierAddress}
+            </if>
+            <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
+                and SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
+            </if>
+            <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
+                and SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
+            </if>
+            <if test="supplierAgent != null and supplierAgent != ''">
+                and SUPPLIER_AGENT = #{supplierAgent}
+            </if>
+            <if test="supplierContactNumber != null and supplierContactNumber != ''">
+                and SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
+            </if>
+            <if test="supplierFax != null and supplierFax != ''">
+                and SUPPLIER_FAX = #{supplierFax}
+            </if>
+            <if test="supplierAccount != null and supplierAccount != ''">
+                and SUPPLIER_ACCOUNT = #{supplierAccount}
+            </if>
+            <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
+                and SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
+            </if>
+            <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
+                and SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
+            </if>
+            <if test="supplierPostalCode != null and supplierPostalCode != ''">
+                and SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
+            </if>
+            <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
+                and SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
+            </if>
+            <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
+                and SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
+            </if>
+            <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
+                and SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
+            </if>
+            <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
+                and SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
+            </if>
+            <if test="supplierRegisterDate != null">
+                and TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = #{supplierRegisterDate}
+            </if>
+            <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
+                and SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
+            </if>
+            <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
+                and SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
+            </if>
+            <if test="supplierCredential != null and supplierCredential != ''">
+                and SUPPLIER_CREDENTIAL = #{supplierCredential}
+            </if>
+            <if test="supplierContactsName != null and supplierContactsName != ''">
+                and SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
+            </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="easSupplierId != null">
+                and EAS_SUPPLIER_ID = #{easSupplierId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="supplierBusinessLicense != null">
+                and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
+            </if>
+            <if test="supplierBusinessAblelicense != null">
+                and SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="supplierId != null">
+                and SUPPLIER_ID = #{supplierId}
+            </if>
+            <if test="supplierName != null and supplierName != ''">
+                and SUPPLIER_NAME LIKE '%${supplierName}%'
+            </if>
+            <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
+                and SUPPLIER_ABBREVIATION LIKE '%${supplierAbbreviation}%'
+            </if>
+            <if test="supplierAddress != null and supplierAddress != ''">
+                and SUPPLIER_ADDRESS LIKE '%${supplierAddress}%'
+            </if>
+            <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
+                and SUPPLIER_LEGAL_REPRESENTATIVE LIKE '%${supplierLegalRepresentative}%'
+            </if>
+            <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
+                and SUPPLIER_REGISTER_NO LIKE '%${supplierRegisterNo}%'
+            </if>
+            <if test="supplierAgent != null and supplierAgent != ''">
+                and SUPPLIER_AGENT LIKE '%${supplierAgent}%'
+            </if>
+            <if test="supplierContactNumber != null and supplierContactNumber != ''">
+                and SUPPLIER_CONTACT_NUMBER LIKE '%${supplierContactNumber}%'
+            </if>
+            <if test="supplierFax != null and supplierFax != ''">
+                and SUPPLIER_FAX LIKE '%${supplierFax}%'
+            </if>
+            <if test="supplierAccount != null and supplierAccount != ''">
+                and SUPPLIER_ACCOUNT LIKE '%${supplierAccount}%'
+            </if>
+            <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
+                and SUPPLIER_ACCOUNT_BLANK LIKE '%${supplierAccountBlank}%'
+            </if>
+            <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
+                and SUPPLIER_DUTY_PARAGRAPH LIKE '%${supplierDutyParagraph}%'
+            </if>
+            <if test="supplierPostalCode != null and supplierPostalCode != ''">
+                and SUPPLIER_POSTAL_CODE LIKE '%${supplierPostalCode}%'
+            </if>
+            <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
+                and SUPPLIER_REGISTER_CAPITAL LIKE '%${supplierRegisterCapital}%'
+            </if>
+            <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
+                and SUPPLIERBUSINESS_SCOPE LIKE '%${supplierbusinessScope}%'
+            </if>
+            <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
+                and SUPPLIER_COMPANY_STATUS LIKE '%${supplierCompanyStatus}%'
+            </if>
+            <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
+                and SUPPLIER_OPERATION_PERIOD LIKE '%${supplierOperationPeriod}%'
+            </if>
+            <if test="supplierRegisterDate != null">
+                and TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = #{supplierRegisterDate}
+            </if>
+            <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
+                and SUPPLIER_REGISTER_ORGANIZATION LIKE '%${supplierRegisterOrganization}%'
+            </if>
+            <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
+                and SUPPLIER_REGISTER_APTITUDES LIKE '%${supplierRegisterAptitudes}%'
+            </if>
+            <if test="supplierCredential != null and supplierCredential != ''">
+                and SUPPLIER_CREDENTIAL LIKE '%${supplierCredential}%'
+            </if>
+            <if test="supplierContactsName != null and supplierContactsName != ''">
+                and SUPPLIER_CONTACTS_NAME LIKE '%${supplierContactsName}%'
+            </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="easSupplierId != null">
+                and EAS_SUPPLIER_ID = #{easSupplierId}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="supplierBusinessLicense != null">
+                and SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
+            </if>
+            <if test="supplierBusinessAblelicense != null">
+                and SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from RMS_SUPPLIER
+        where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from RMS_SUPPLIER
+        where 1!=1
+        <if test="supplierName != null and supplierName != ''">
+            or SUPPLIER_NAME = #{supplierName}
+        </if>
+        <if test="supplierAbbreviation != null and supplierAbbreviation != ''">
+            or SUPPLIER_ABBREVIATION = #{supplierAbbreviation}
+        </if>
+        <if test="supplierAddress != null and supplierAddress != ''">
+            or SUPPLIER_ADDRESS = #{supplierAddress}
+        </if>
+        <if test="supplierLegalRepresentative != null and supplierLegalRepresentative != ''">
+            or SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative}
+        </if>
+        <if test="supplierRegisterNo != null and supplierRegisterNo != ''">
+            or SUPPLIER_REGISTER_NO = #{supplierRegisterNo}
+        </if>
+        <if test="supplierAgent != null and supplierAgent != ''">
+            or SUPPLIER_AGENT = #{supplierAgent}
+        </if>
+        <if test="supplierContactNumber != null and supplierContactNumber != ''">
+            or SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber}
+        </if>
+        <if test="supplierFax != null and supplierFax != ''">
+            or SUPPLIER_FAX = #{supplierFax}
+        </if>
+        <if test="supplierAccount != null and supplierAccount != ''">
+            or SUPPLIER_ACCOUNT = #{supplierAccount}
+        </if>
+        <if test="supplierAccountBlank != null and supplierAccountBlank != ''">
+            or SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank}
+        </if>
+        <if test="supplierDutyParagraph != null and supplierDutyParagraph != ''">
+            or SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
+        </if>
+        <if test="supplierPostalCode != null and supplierPostalCode != ''">
+            or SUPPLIER_POSTAL_CODE = #{supplierPostalCode}
+        </if>
+        <if test="supplierRegisterCapital != null and supplierRegisterCapital != ''">
+            or SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital}
+        </if>
+        <if test="supplierbusinessScope != null and supplierbusinessScope != ''">
+            or SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope}
+        </if>
+        <if test="supplierCompanyStatus != null and supplierCompanyStatus != ''">
+            or SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus}
+        </if>
+        <if test="supplierOperationPeriod != null and supplierOperationPeriod != ''">
+            or SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod}
+        </if>
+        <if test="supplierRegisterDate != null">
+            or TO_CHAR(SUPPLIER_REGISTER_DATE,'yyyy-MM-dd') = '#{supplierRegisterDate}'
+        </if>
+        <if test="supplierRegisterOrganization != null and supplierRegisterOrganization != ''">
+            or SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization}
+        </if>
+        <if test="supplierRegisterAptitudes != null and supplierRegisterAptitudes != ''">
+            or SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes}
+        </if>
+        <if test="supplierCredential != null and supplierCredential != ''">
+            or SUPPLIER_CREDENTIAL = #{supplierCredential}
+        </if>
+        <if test="supplierContactsName != null and supplierContactsName != ''">
+            or SUPPLIER_CONTACTS_NAME = #{supplierContactsName}
+        </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="easSupplierId != null">
+            or EAS_SUPPLIER_ID = #{easSupplierId}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+        <if test="supplierBusinessLicense != null">
+            or SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense}
+        </if>
+        <if test="supplierBusinessAblelicense != null">
+            or SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsSupplier">
+        insert into RMS_SUPPLIER (SUPPLIER_ID, SUPPLIER_NAME, SUPPLIER_ABBREVIATION,
+                                  SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+                                  SUPPLIER_REGISTER_NO, SUPPLIER_AGENT, SUPPLIER_CONTACT_NUMBER,
+                                  SUPPLIER_FAX, SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK,
+                                  SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE,
+                                  SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE,
+                                  SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD,
+                                  SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION,
+                                  SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL,
+                                  SUPPLIER_CONTACTS_NAME, INSERT_USERNAME, INSERT_TIME,
+                                  UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                  EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE,
+                                  SUPPLIER_BUSINESS_ABLELICENSE)
+        values (#{supplierId,jdbcType=DECIMAL}, #{supplierName,jdbcType=VARCHAR},
+                #{supplierAbbreviation,jdbcType=VARCHAR},
+                #{supplierAddress,jdbcType=VARCHAR}, #{supplierLegalRepresentative,jdbcType=VARCHAR},
+                #{supplierRegisterNo,jdbcType=VARCHAR}, #{supplierAgent,jdbcType=VARCHAR},
+                #{supplierContactNumber,jdbcType=VARCHAR},
+                #{supplierFax,jdbcType=VARCHAR}, #{supplierAccount,jdbcType=VARCHAR},
+                #{supplierAccountBlank,jdbcType=VARCHAR},
+                #{supplierDutyParagraph,jdbcType=VARCHAR}, #{supplierPostalCode,jdbcType=VARCHAR},
+                #{supplierRegisterCapital,jdbcType=VARCHAR}, #{supplierbusinessScope,jdbcType=VARCHAR},
+                #{supplierCompanyStatus,jdbcType=VARCHAR}, #{supplierOperationPeriod,jdbcType=VARCHAR},
+                #{supplierRegisterDate,jdbcType=TIMESTAMP}, #{supplierRegisterOrganization,jdbcType=VARCHAR},
+                #{supplierRegisterAptitudes,jdbcType=VARCHAR}, #{supplierCredential,jdbcType=VARCHAR},
+                #{supplierContactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{easSupplierId,jdbcType=DECIMAL}, #{deleted,jdbcType=DECIMAL},
+                #{supplierBusinessLicense,jdbcType=BLOB},
+                #{supplierBusinessAblelicense,jdbcType=BLOB})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
+        insert into RMS_SUPPLIER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="supplierId != null">
+                SUPPLIER_ID,
+            </if>
+            <if test="supplierName != null">
+                SUPPLIER_NAME,
+            </if>
+            <if test="supplierAbbreviation != null">
+                SUPPLIER_ABBREVIATION,
+            </if>
+            <if test="supplierAddress != null">
+                SUPPLIER_ADDRESS,
+            </if>
+            <if test="supplierLegalRepresentative != null">
+                SUPPLIER_LEGAL_REPRESENTATIVE,
+            </if>
+            <if test="supplierRegisterNo != null">
+                SUPPLIER_REGISTER_NO,
+            </if>
+            <if test="supplierAgent != null">
+                SUPPLIER_AGENT,
+            </if>
+            <if test="supplierContactNumber != null">
+                SUPPLIER_CONTACT_NUMBER,
+            </if>
+            <if test="supplierFax != null">
+                SUPPLIER_FAX,
+            </if>
+            <if test="supplierAccount != null">
+                SUPPLIER_ACCOUNT,
+            </if>
+            <if test="supplierAccountBlank != null">
+                SUPPLIER_ACCOUNT_BLANK,
+            </if>
+            <if test="supplierDutyParagraph != null">
+                SUPPLIER_DUTY_PARAGRAPH,
+            </if>
+            <if test="supplierPostalCode != null">
+                SUPPLIER_POSTAL_CODE,
+            </if>
+            <if test="supplierRegisterCapital != null">
+                SUPPLIER_REGISTER_CAPITAL,
+            </if>
+            <if test="supplierbusinessScope != null">
+                SUPPLIERBUSINESS_SCOPE,
+            </if>
+            <if test="supplierCompanyStatus != null">
+                SUPPLIER_COMPANY_STATUS,
+            </if>
+            <if test="supplierOperationPeriod != null">
+                SUPPLIER_OPERATION_PERIOD,
+            </if>
+            <if test="supplierRegisterDate != null">
+                SUPPLIER_REGISTER_DATE,
+            </if>
+            <if test="supplierRegisterOrganization != null">
+                SUPPLIER_REGISTER_ORGANIZATION,
+            </if>
+            <if test="supplierRegisterAptitudes != null">
+                SUPPLIER_REGISTER_APTITUDES,
+            </if>
+            <if test="supplierCredential != null">
+                SUPPLIER_CREDENTIAL,
+            </if>
+            <if test="supplierContactsName != null">
+                SUPPLIER_CONTACTS_NAME,
+            </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="easSupplierId != null">
+                EAS_SUPPLIER_ID,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+            <if test="supplierBusinessLicense != null">
+                SUPPLIER_BUSINESS_LICENSE,
+            </if>
+            <if test="supplierBusinessAblelicense != null">
+                SUPPLIER_BUSINESS_ABLELICENSE,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="supplierId != null">
+                #{supplierId,jdbcType=DECIMAL},
+            </if>
+            <if test="supplierName != null">
+                #{supplierName,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAbbreviation != null">
+                #{supplierAbbreviation,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAddress != null">
+                #{supplierAddress,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierLegalRepresentative != null">
+                #{supplierLegalRepresentative,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterNo != null">
+                #{supplierRegisterNo,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAgent != null">
+                #{supplierAgent,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierContactNumber != null">
+                #{supplierContactNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierFax != null">
+                #{supplierFax,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAccount != null">
+                #{supplierAccount,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAccountBlank != null">
+                #{supplierAccountBlank,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierDutyParagraph != null">
+                #{supplierDutyParagraph,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierPostalCode != null">
+                #{supplierPostalCode,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterCapital != null">
+                #{supplierRegisterCapital,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierbusinessScope != null">
+                #{supplierbusinessScope,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierCompanyStatus != null">
+                #{supplierCompanyStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierOperationPeriod != null">
+                #{supplierOperationPeriod,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterDate != null">
+                #{supplierRegisterDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="supplierRegisterOrganization != null">
+                #{supplierRegisterOrganization,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterAptitudes != null">
+                #{supplierRegisterAptitudes,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierCredential != null">
+                #{supplierCredential,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierContactsName != null">
+                #{supplierContactsName,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="easSupplierId != null">
+                #{easSupplierId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="supplierBusinessLicense != null">
+                #{supplierBusinessLicense,jdbcType=BLOB},
+            </if>
+            <if test="supplierBusinessAblelicense != null">
+                #{supplierBusinessAblelicense,jdbcType=BLOB},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsSupplier">
+        update RMS_SUPPLIER
+        set SUPPLIER_NAME                  = #{supplierName,jdbcType=VARCHAR},
+            SUPPLIER_ABBREVIATION          = #{supplierAbbreviation,jdbcType=VARCHAR},
+            SUPPLIER_ADDRESS               = #{supplierAddress,jdbcType=VARCHAR},
+            SUPPLIER_LEGAL_REPRESENTATIVE  = #{supplierLegalRepresentative,jdbcType=VARCHAR},
+            SUPPLIER_REGISTER_NO           = #{supplierRegisterNo,jdbcType=VARCHAR},
+            SUPPLIER_AGENT                 = #{supplierAgent,jdbcType=VARCHAR},
+            SUPPLIER_CONTACT_NUMBER        = #{supplierContactNumber,jdbcType=VARCHAR},
+            SUPPLIER_FAX                   = #{supplierFax,jdbcType=VARCHAR},
+            SUPPLIER_ACCOUNT               = #{supplierAccount,jdbcType=VARCHAR},
+            SUPPLIER_ACCOUNT_BLANK         = #{supplierAccountBlank,jdbcType=VARCHAR},
+            SUPPLIER_DUTY_PARAGRAPH        = #{supplierDutyParagraph,jdbcType=VARCHAR},
+            SUPPLIER_POSTAL_CODE           = #{supplierPostalCode,jdbcType=VARCHAR},
+            SUPPLIER_REGISTER_CAPITAL      = #{supplierRegisterCapital,jdbcType=VARCHAR},
+            SUPPLIERBUSINESS_SCOPE         = #{supplierbusinessScope,jdbcType=VARCHAR},
+            SUPPLIER_COMPANY_STATUS        = #{supplierCompanyStatus,jdbcType=VARCHAR},
+            SUPPLIER_OPERATION_PERIOD      = #{supplierOperationPeriod,jdbcType=VARCHAR},
+            SUPPLIER_REGISTER_DATE         = #{supplierRegisterDate,jdbcType=TIMESTAMP},
+            SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
+            SUPPLIER_REGISTER_APTITUDES    = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
+            SUPPLIER_CREDENTIAL            = #{supplierCredential,jdbcType=VARCHAR},
+            SUPPLIER_CONTACTS_NAME         = #{supplierContactsName,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},
+            EAS_SUPPLIER_ID                = #{easSupplierId,jdbcType=DECIMAL},
+            DELETED                        = #{deleted,jdbcType=DECIMAL},
+            SUPPLIER_BUSINESS_LICENSE      = #{supplierBusinessLicense,jdbcType=BLOB},
+            SUPPLIER_BUSINESS_ABLELICENSE  = #{supplierBusinessAblelicense,jdbcType=BLOB}
+        where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
+        update RMS_SUPPLIER
+        <set>
+            <if test="supplierName != null">
+                SUPPLIER_NAME = #{supplierName,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAbbreviation != null">
+                SUPPLIER_ABBREVIATION = #{supplierAbbreviation,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAddress != null">
+                SUPPLIER_ADDRESS = #{supplierAddress,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierLegalRepresentative != null">
+                SUPPLIER_LEGAL_REPRESENTATIVE = #{supplierLegalRepresentative,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterNo != null">
+                SUPPLIER_REGISTER_NO = #{supplierRegisterNo,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAgent != null">
+                SUPPLIER_AGENT = #{supplierAgent,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierContactNumber != null">
+                SUPPLIER_CONTACT_NUMBER = #{supplierContactNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierFax != null">
+                SUPPLIER_FAX = #{supplierFax,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAccount != null">
+                SUPPLIER_ACCOUNT = #{supplierAccount,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierAccountBlank != null">
+                SUPPLIER_ACCOUNT_BLANK = #{supplierAccountBlank,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierDutyParagraph != null">
+                SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierPostalCode != null">
+                SUPPLIER_POSTAL_CODE = #{supplierPostalCode,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterCapital != null">
+                SUPPLIER_REGISTER_CAPITAL = #{supplierRegisterCapital,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierbusinessScope != null">
+                SUPPLIERBUSINESS_SCOPE = #{supplierbusinessScope,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierCompanyStatus != null">
+                SUPPLIER_COMPANY_STATUS = #{supplierCompanyStatus,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierOperationPeriod != null">
+                SUPPLIER_OPERATION_PERIOD = #{supplierOperationPeriod,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterDate != null">
+                SUPPLIER_REGISTER_DATE = #{supplierRegisterDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="supplierRegisterOrganization != null">
+                SUPPLIER_REGISTER_ORGANIZATION = #{supplierRegisterOrganization,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierRegisterAptitudes != null">
+                SUPPLIER_REGISTER_APTITUDES = #{supplierRegisterAptitudes,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierCredential != null">
+                SUPPLIER_CREDENTIAL = #{supplierCredential,jdbcType=VARCHAR},
+            </if>
+            <if test="supplierContactsName != null">
+                SUPPLIER_CONTACTS_NAME = #{supplierContactsName,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="easSupplierId != null">
+                EAS_SUPPLIER_ID = #{easSupplierId,jdbcType=DECIMAL},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="supplierBusinessLicense != null">
+                SUPPLIER_BUSINESS_LICENSE = #{supplierBusinessLicense,jdbcType=BLOB},
+            </if>
+            <if test="supplierBusinessAblelicense != null">
+                SUPPLIER_BUSINESS_ABLELICENSE = #{supplierBusinessAblelicense,jdbcType=BLOB},
+            </if>
+        </set>
+        where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into RMS_SUPPLIER
+        (SUPPLIER_ID,
+        SUPPLIER_NAME, SUPPLIER_ABBREVIATION,
+        SUPPLIER_ADDRESS, SUPPLIER_LEGAL_REPRESENTATIVE,
+        SUPPLIER_REGISTER_NO, SUPPLIER_AGENT,
+        SUPPLIER_CONTACT_NUMBER, SUPPLIER_FAX,
+        SUPPLIER_ACCOUNT, SUPPLIER_ACCOUNT_BLANK,
+        SUPPLIER_DUTY_PARAGRAPH, SUPPLIER_POSTAL_CODE,
+        SUPPLIER_REGISTER_CAPITAL, SUPPLIERBUSINESS_SCOPE,
+        SUPPLIER_COMPANY_STATUS, SUPPLIER_OPERATION_PERIOD,
+        SUPPLIER_REGISTER_DATE, SUPPLIER_REGISTER_ORGANIZATION,
+        SUPPLIER_REGISTER_APTITUDES, SUPPLIER_CREDENTIAL,
+        SUPPLIER_CONTACTS_NAME, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        EAS_SUPPLIER_ID, DELETED, SUPPLIER_BUSINESS_LICENSE,
+        SUPPLIER_BUSINESS_ABLELICENSE)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.supplierId,jdbcType=DECIMAL},
+        #{item.supplierName,jdbcType=VARCHAR}, #{item.supplierAbbreviation,jdbcType=VARCHAR},
+        #{item.supplierAddress,jdbcType=VARCHAR}, #{item.supplierLegalRepresentative,jdbcType=VARCHAR},
+        #{item.supplierRegisterNo,jdbcType=VARCHAR}, #{item.supplierAgent,jdbcType=VARCHAR},
+        #{item.supplierContactNumber,jdbcType=VARCHAR}, #{item.supplierFax,jdbcType=VARCHAR},
+        #{item.supplierAccount,jdbcType=VARCHAR}, #{item.supplierAccountBlank,jdbcType=VARCHAR},
+        #{item.supplierDutyParagraph,jdbcType=VARCHAR}, #{item.supplierPostalCode,jdbcType=VARCHAR},
+        #{item.supplierRegisterCapital,jdbcType=VARCHAR}, #{item.supplierbusinessScope,jdbcType=VARCHAR},
+        #{item.supplierCompanyStatus,jdbcType=VARCHAR}, #{item.supplierOperationPeriod,jdbcType=VARCHAR},
+        #{item.supplierRegisterDate,jdbcType=TIMESTAMP}, #{item.supplierRegisterOrganization,jdbcType=VARCHAR},
+        #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}, #{item.supplierCredential,jdbcType=VARCHAR},
+        #{item.supplierContactsName,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.easSupplierId,jdbcType=DECIMAL}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.supplierBusinessLicense,jdbcType=BLOB},
+        #{item.supplierBusinessAblelicense,jdbcType=BLOB} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update RMS_SUPPLIER
+        set
+        SUPPLIER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierId,jdbcType=DECIMAL}
+        </foreach>
+        ,SUPPLIER_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierName,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_ABBREVIATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAbbreviation,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_ADDRESS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAddress,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_LEGAL_REPRESENTATIVE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierLegalRepresentative,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_REGISTER_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterNo,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_AGENT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAgent,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_CONTACT_NUMBER=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_FAX=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierFax,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_ACCOUNT=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccount,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_ACCOUNT_BLANK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierAccountBlank,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_DUTY_PARAGRAPH=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierDutyParagraph,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_POSTAL_CODE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierPostalCode,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_REGISTER_CAPITAL=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterCapital,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIERBUSINESS_SCOPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierbusinessScope,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_COMPANY_STATUS=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCompanyStatus,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_OPERATION_PERIOD=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierOperationPeriod,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_REGISTER_DATE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,SUPPLIER_REGISTER_ORGANIZATION=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterOrganization,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_REGISTER_APTITUDES=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierRegisterAptitudes,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_CREDENTIAL=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierCredential,jdbcType=VARCHAR}
+        </foreach>
+        ,SUPPLIER_CONTACTS_NAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierContactsName,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,EAS_SUPPLIER_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.easSupplierId,jdbcType=DECIMAL}
+        </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        ,SUPPLIER_BUSINESS_LICENSE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessLicense,jdbcType=BLOB}
+        </foreach>
+        ,SUPPLIER_BUSINESS_ABLELICENSE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.supplierBusinessAblelicense,jdbcType=BLOB}
+        </foreach>
+        where SUPPLIER_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.supplierId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from RMS_SUPPLIER
+        where SUPPLIER_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 查询供应商列表 -->
+    <select id="getSupplierList" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "supplierDutyParagraph",
+        RS.SUPPLIER_NAME AS "supplierName",
+        RS.SUPPLIER_ADDRESS AS "supplierAddress",
+        RS.SUPPLIER_REGISTER_DATE AS "supplierRegisterDate",
+        RS.SUPPLIER_CONTACTS_NAME AS "supplierContactsName",
+        RS.SUPPLIER_CONTACT_NUMBER AS "supplierContactNumber"
+        FROM RMS_SUPPLIER RS
+        WHERE RS.DELETED != 0
+        )
+        <where>
+            <if test="supplierDutyParagraph!= null">
+                and
+                <foreach collection="supplierDutyParagraph" item="item" open="(" separator="," close=")">
+                    "supplierDutyParagraph" in #{item}
+                </foreach>
+            </if>
+            <if test="supplierName!= null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="," close=")">
+                    "supplierName" in #{item}
+                </foreach>
+            </if>
+            <if test="supplierAddress!= null">
+                and
+                <foreach collection="supplierAddress" item="item" open="(" separator="," close=")">
+                    "supplierAddress" in #{item}
+                </foreach>
+            </if>
+            <if test="supplierRegisterDate!= null">
+                and
+                <foreach collection="supplierRegisterDate" item="item" open="(" separator="," close=")">
+                    "supplierRegisterDate" in to_date('${item}','yyyy-mm-dd hh24:mi:ss')
+                </foreach>
+            </if>
+            <if test="supplierContactsName!= null">
+                and
+                <foreach collection="supplierContactsName" item="item" open="(" separator="," close=")">
+                    "supplierContactsName" in #{item}
+                </foreach>
+            </if>
+            <if test="supplierContactNumber!= null">
+                and
+                <foreach collection="supplierContactNumber" item="item" open="(" separator="," close=")">
+                    "supplierContactNumber" in #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+</mapper>

+ 268 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsUnitOfMeasureMapper.xml

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

+ 322 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckMeasureCommissionMapper.xml

@@ -0,0 +1,322 @@
+<?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.TmstruckMeasureCommissionMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckMeasureCommission">
+        <id column="COMMSSION_ID" jdbcType="DECIMAL" property="commssionId"/>
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
+        <result column="COMMSSION_TYPE" jdbcType="DECIMAL" property="commssionType"/>
+        <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">
+        COMMSSION_ID, RESULT_TOTAL_ID, COMMSSION_TYPE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="columns_alias">
+        t.COMMSSION_ID, t.RESULT_TOTAL_ID, t.COMMSSION_TYPE, 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 TMSTRUCK_MEASURE_COMMISSION
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSTRUCK_MEASURE_COMMISSION t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="commssionId != null">
+                and COMMSSION_ID = #{commssionId}
+            </if>
+            <if test="resultTotalId != null">
+                and RESULT_TOTAL_ID = #{resultTotalId}
+            </if>
+            <if test="commssionType != null">
+                and COMMSSION_TYPE = #{commssionType}
+            </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="commssionId != null">
+                and COMMSSION_ID = #{commssionId}
+            </if>
+            <if test="resultTotalId != null">
+                and RESULT_TOTAL_ID = #{resultTotalId}
+            </if>
+            <if test="commssionType != null">
+                and COMMSSION_TYPE = #{commssionType}
+            </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 TMSTRUCK_MEASURE_COMMISSION
+        where COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSTRUCK_MEASURE_COMMISSION
+        where 1!=1
+        <if test="resultTotalId != null">
+            or RESULT_TOTAL_ID = #{resultTotalId}
+        </if>
+        <if test="commssionType != null">
+            or COMMSSION_TYPE = #{commssionType}
+        </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.TmstruckMeasureCommission">
+        insert into TMSTRUCK_MEASURE_COMMISSION (COMMSSION_ID, RESULT_TOTAL_ID, COMMSSION_TYPE,
+                                                 INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                                 UPDATE_TIME, INSERT_UPDATE_REMARK)
+        values (#{commssionId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{commssionType,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.TmstruckMeasureCommission">
+        insert into TMSTRUCK_MEASURE_COMMISSION
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="commssionId != null">
+                COMMSSION_ID,
+            </if>
+            <if test="resultTotalId != null">
+                RESULT_TOTAL_ID,
+            </if>
+            <if test="commssionType != null">
+                COMMSSION_TYPE,
+            </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="commssionId != null">
+                #{commssionId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTotalId != null">
+                #{resultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="commssionType != null">
+                #{commssionType,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.TmstruckMeasureCommission">
+        update TMSTRUCK_MEASURE_COMMISSION
+        set RESULT_TOTAL_ID      = #{resultTotalId,jdbcType=DECIMAL},
+            COMMSSION_TYPE       = #{commssionType,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 COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckMeasureCommission">
+        update TMSTRUCK_MEASURE_COMMISSION
+        <set>
+            <if test="resultTotalId != null">
+                RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="commssionType != null">
+                COMMSSION_TYPE = #{commssionType,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 COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where COMMSSION_ID = #{commssionId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSTRUCK_MEASURE_COMMISSION
+        (COMMSSION_ID,
+        RESULT_TOTAL_ID, COMMSSION_TYPE,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.commssionId,jdbcType=DECIMAL},
+        #{item.resultTotalId,jdbcType=DECIMAL}, #{item.commssionType,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 TMSTRUCK_MEASURE_COMMISSION
+        set
+        COMMSSION_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.commssionId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_TOTAL_ID=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+        </foreach>
+        ,COMMSSION_TYPE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.commssionType,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach collection="list" item="item" index="index" separator=" " open="case COMMSSION_ID" close="end">
+            when #{item.commssionId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where COMMSSION_ID in
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+            #{item.commssionId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSTRUCK_MEASURE_COMMISSION
+        where COMMSSION_ID in
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 得到总实绩id -->
+    <select id="getResultTotalId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT TTR.RESULT_TOTAL_ID AS "resultTotalId"
+        FROM TMSTRUCK_TOTAL_RESULT TTR
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_ID = TTR.ORDER_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!-- 得到计量委托信息 -->
+    <select id="getMeasureCommission" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_NUMBER       AS "orderNumber",
+               APO.PURCHASE_ORDER_NO AS "purchaseOrderNo",
+               RC.CAPACITY_NUMBER    AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
+    </select>
+</mapper>

+ 574 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -0,0 +1,574 @@
+<?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.TmstruckWeightResultMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckWeightResult">
+        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId"/>
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
+        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo"/>
+        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight"/>
+        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime"/>
+        <result column="RESULT_TARE_WEIGHT" jdbcType="DECIMAL" property="resultTareWeight"/>
+        <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultTareWeightTime"/>
+        <result column="RESULT_NET_WEIGHT" jdbcType="DECIMAL" property="resultNetWeight"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
+        <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime"/>
+        <result column="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId"/>
+        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId"/>
+    </resultMap>
+    <sql id="columns">
+        WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
+    RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME, 
+    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID
+    </sql>
+    <sql id="columns_alias">
+        t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT,
+    t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT, t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DELETE_NAME, t.DELETE_TIME, t.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM TMSTRUCK_WEIGHT_RESULT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM TMSTRUCK_WEIGHT_RESULT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="weightTaskResultId != null">
+                and WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
+            </if>
+            <if test="resultTotalId != null">
+                and RESULT_TOTAL_ID = #{resultTotalId}
+            </if>
+            <if test="resultPoundNo != null and resultPoundNo != ''">
+                and RESULT_POUND_NO = #{resultPoundNo}
+            </if>
+            <if test="resultGrossWeight != null">
+                and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+            </if>
+            <if test="resultTareWeight != null">
+                and RESULT_TARE_WEIGHT = #{resultTareWeight}
+            </if>
+            <if test="resultTareWeightTime != null">
+                and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+            </if>
+            <if test="resultNetWeight != null">
+                and RESULT_NET_WEIGHT = #{resultNetWeight}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME = #{insertUsername}
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME = #{updateUsername}
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME = #{deleteName}
+            </if>
+            <if test="deleteTime != null">
+                and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+            </if>
+            <if test="resultGrossPlaceId != null">
+                and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+            </if>
+            <if test="resultTarePlaceId != null">
+                and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="weightTaskResultId != null">
+                and WEIGHT_TASK_RESULT_ID = #{weightTaskResultId}
+            </if>
+            <if test="resultTotalId != null">
+                and RESULT_TOTAL_ID = #{resultTotalId}
+            </if>
+            <if test="resultPoundNo != null and resultPoundNo != ''">
+                and RESULT_POUND_NO LIKE '%${resultPoundNo}%'
+            </if>
+            <if test="resultGrossWeight != null">
+                and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+            </if>
+            <if test="resultGrossWeightTime != null">
+                and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+            </if>
+            <if test="resultTareWeight != null">
+                and RESULT_TARE_WEIGHT = #{resultTareWeight}
+            </if>
+            <if test="resultTareWeightTime != null">
+                and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+            </if>
+            <if test="resultNetWeight != null">
+                and RESULT_NET_WEIGHT = #{resultNetWeight}
+            </if>
+            <if test="insertUsername != null and insertUsername != ''">
+                and INSERT_USERNAME LIKE '%${insertUsername}%'
+            </if>
+            <if test="insertTime != null">
+                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+            </if>
+            <if test="updateUsername != null and updateUsername != ''">
+                and UPDATE_USERNAME LIKE '%${updateUsername}%'
+            </if>
+            <if test="updateTime != null">
+                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+            </if>
+            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleteName != null and deleteName != ''">
+                and DELETE_NAME LIKE '%${deleteName}%'
+            </if>
+            <if test="deleteTime != null">
+                and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+            </if>
+            <if test="resultGrossPlaceId != null">
+                and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+            </if>
+            <if test="resultTarePlaceId != null">
+                and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+        delete
+        from TMSTRUCK_WEIGHT_RESULT
+        where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from TMSTRUCK_WEIGHT_RESULT
+        where 1!=1
+        <if test="resultTotalId != null">
+            or RESULT_TOTAL_ID = #{resultTotalId}
+        </if>
+        <if test="resultPoundNo != null and resultPoundNo != ''">
+            or RESULT_POUND_NO = #{resultPoundNo}
+        </if>
+        <if test="resultGrossWeight != null">
+            or RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+        </if>
+        <if test="resultGrossWeightTime != null">
+            or TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultGrossWeightTime}'
+        </if>
+        <if test="resultTareWeight != null">
+            or RESULT_TARE_WEIGHT = #{resultTareWeight}
+        </if>
+        <if test="resultTareWeightTime != null">
+            or TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultTareWeightTime}'
+        </if>
+        <if test="resultNetWeight != null">
+            or RESULT_NET_WEIGHT = #{resultNetWeight}
+        </if>
+        <if test="insertUsername != null and insertUsername != ''">
+            or INSERT_USERNAME = #{insertUsername}
+        </if>
+        <if test="insertTime != null">
+            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+        </if>
+        <if test="updateUsername != null and updateUsername != ''">
+            or UPDATE_USERNAME = #{updateUsername}
+        </if>
+        <if test="updateTime != null">
+            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+        </if>
+        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleteName != null and deleteName != ''">
+            or DELETE_NAME = #{deleteName}
+        </if>
+        <if test="deleteTime != null">
+            or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+        </if>
+        <if test="resultGrossPlaceId != null">
+            or RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+        </if>
+        <if test="resultTarePlaceId != null">
+            or RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
+        insert into TMSTRUCK_WEIGHT_RESULT (WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID,
+                                            RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
+                                            RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME,
+                                            RESULT_NET_WEIGHT, INSERT_USERNAME, INSERT_TIME,
+                                            UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                            DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
+                                            RESULT_TARE_PLACE_ID)
+        values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
+                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL},
+                #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+                #{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP},
+                #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+                #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP},
+                #{resultGrossPlaceId,jdbcType=DECIMAL},
+                #{resultTarePlaceId,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
+        insert into TMSTRUCK_WEIGHT_RESULT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="weightTaskResultId != null">
+                WEIGHT_TASK_RESULT_ID,
+            </if>
+            <if test="resultTotalId != null">
+                RESULT_TOTAL_ID,
+            </if>
+            <if test="resultPoundNo != null">
+                RESULT_POUND_NO,
+            </if>
+            <if test="resultGrossWeight != null">
+                RESULT_GROSS_WEIGHT,
+            </if>
+            <if test="resultGrossWeightTime != null">
+                RESULT_GROSS_WEIGHT_TIME,
+            </if>
+            <if test="resultTareWeight != null">
+                RESULT_TARE_WEIGHT,
+            </if>
+            <if test="resultTareWeightTime != null">
+                RESULT_TARE_WEIGHT_TIME,
+            </if>
+            <if test="resultNetWeight != null">
+                RESULT_NET_WEIGHT,
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME,
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME,
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME,
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME,
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME,
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME,
+            </if>
+            <if test="resultGrossPlaceId != null">
+                RESULT_GROSS_PLACE_ID,
+            </if>
+            <if test="resultTarePlaceId != null">
+                RESULT_TARE_PLACE_ID,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="weightTaskResultId != null">
+                #{weightTaskResultId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTotalId != null">
+                #{resultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultPoundNo != null">
+                #{resultPoundNo,jdbcType=VARCHAR},
+            </if>
+            <if test="resultGrossWeight != null">
+                #{resultGrossWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="resultGrossWeightTime != null">
+                #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultTareWeight != null">
+                #{resultTareWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTareWeightTime != null">
+                #{resultTareWeightTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultNetWeight != null">
+                #{resultNetWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                #{deleteTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultGrossPlaceId != null">
+                #{resultGrossPlaceId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTarePlaceId != null">
+                #{resultTarePlaceId,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
+        update TMSTRUCK_WEIGHT_RESULT
+        set RESULT_TOTAL_ID          = #{resultTotalId,jdbcType=DECIMAL},
+            RESULT_POUND_NO          = #{resultPoundNo,jdbcType=VARCHAR},
+            RESULT_GROSS_WEIGHT      = #{resultGrossWeight,jdbcType=DECIMAL},
+            RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+            RESULT_TARE_WEIGHT       = #{resultTareWeight,jdbcType=DECIMAL},
+            RESULT_TARE_WEIGHT_TIME  = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+            RESULT_NET_WEIGHT        = #{resultNetWeight,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},
+            DELETE_NAME              = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME              = #{deleteTime,jdbcType=TIMESTAMP},
+            RESULT_GROSS_PLACE_ID    = #{resultGrossPlaceId,jdbcType=DECIMAL},
+            RESULT_TARE_PLACE_ID     = #{resultTarePlaceId,jdbcType=DECIMAL}
+        where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
+        update TMSTRUCK_WEIGHT_RESULT
+        <set>
+            <if test="resultTotalId != null">
+                RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultPoundNo != null">
+                RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+            </if>
+            <if test="resultGrossWeight != null">
+                RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="resultGrossWeightTime != null">
+                RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultTareWeight != null">
+                RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTareWeightTime != null">
+                RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultNetWeight != null">
+                RESULT_NET_WEIGHT = #{resultNetWeight,jdbcType=DECIMAL},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteName != null">
+                DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            </if>
+            <if test="deleteTime != null">
+                DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="resultGrossPlaceId != null">
+                RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+            </if>
+            <if test="resultTarePlaceId != null">
+                RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
+    </select>
+    <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="where"/>
+    </select>
+    <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+        <include refid="select"/>
+        <include refid="whereLike"/>
+    </select>
+    <insert id="batchInsert" parameterType="java.util.List">
+        insert into TMSTRUCK_WEIGHT_RESULT
+        (WEIGHT_TASK_RESULT_ID,
+        RESULT_TOTAL_ID, RESULT_POUND_NO,
+        RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
+        RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME,
+        RESULT_NET_WEIGHT, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
+        RESULT_TARE_PLACE_ID)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.weightTaskResultId,jdbcType=DECIMAL},
+        #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultPoundNo,jdbcType=VARCHAR},
+        #{item.resultGrossWeight,jdbcType=DECIMAL}, #{item.resultGrossWeightTime,jdbcType=TIMESTAMP},
+        #{item.resultTareWeight,jdbcType=DECIMAL}, #{item.resultTareWeightTime,jdbcType=TIMESTAMP},
+        #{item.resultNetWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP},
+        #{item.resultGrossPlaceId,jdbcType=DECIMAL},
+        #{item.resultTarePlaceId,jdbcType=DECIMAL} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update TMSTRUCK_WEIGHT_RESULT
+        set
+        WEIGHT_TASK_RESULT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.weightTaskResultId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_TOTAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_POUND_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
+        </foreach>
+        ,RESULT_GROSS_WEIGHT=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_GROSS_WEIGHT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_TARE_WEIGHT=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_TARE_WEIGHT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_NET_WEIGHT=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_NAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,RESULT_GROSS_PLACE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
+        </foreach>
+        ,RESULT_TARE_PLACE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
+                 separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
+        </foreach>
+        where WEIGHT_TASK_RESULT_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.weightTaskResultId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from TMSTRUCK_WEIGHT_RESULT
+        where WEIGHT_TASK_RESULT_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+    <!-- 得到计重实绩主键id -->
+    <select id="getWeightTaskResultId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT TWR.WEIGHT_TASK_RESULT_ID as "weightTaskResultId"
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_ID = TTR.ORDER_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!-- 得到汽车衡id -->
+    <select id="getTruckCalculateId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT
+        RTC.TRUCK_CALCULATE_ID AS "resultTarePlaceId"
+        FROM RMS_TRUCK_CALCULATE RTC
+        WHERE RTC.TRUCK_CALCULATE_NUMBER = #{resultCalculateNumber}
+    </select>
+
+</mapper>

+ 80 - 0
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

+ 4 - 0
src/main/resources/message.properties

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