Browse Source

'修改采购接口'

HUJIANGUO 3 năm trước cách đây
mục cha
commit
a9ac07a401
56 tập tin đã thay đổi với 5579 bổ sung795 xóa
  1. 1 0
      pom.xml
  2. 59 0
      src/main/java/com/steerinfo/dil/controller/BmsportHandlingFeeController.java
  3. 64 0
      src/main/java/com/steerinfo/dil/controller/BmsshipDetailsOrderController.java
  4. 59 0
      src/main/java/com/steerinfo/dil/controller/BmsshipStatementController.java
  5. 49 0
      src/main/java/com/steerinfo/dil/controller/BmstrainDetailsOrderController.java
  6. 59 0
      src/main/java/com/steerinfo/dil/controller/BmstrainSettlementController.java
  7. 61 0
      src/main/java/com/steerinfo/dil/controller/BmstrainStatementController.java
  8. 22 5
      src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java
  9. 10 0
      src/main/java/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.java
  10. 10 0
      src/main/java/com/steerinfo/dil/mapper/BmsshipDetailsOrderMapper.java
  11. 10 0
      src/main/java/com/steerinfo/dil/mapper/BmsshipStatementMapper.java
  12. 15 0
      src/main/java/com/steerinfo/dil/mapper/BmstrainDetailsOrderMapper.java
  13. 10 0
      src/main/java/com/steerinfo/dil/mapper/BmstrainSettlementMapper.java
  14. 18 0
      src/main/java/com/steerinfo/dil/mapper/BmstrainStatementMapper.java
  15. 9 2
      src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java
  16. 6 5
      src/main/java/com/steerinfo/dil/model/AmsPurchaseOrder.java
  17. 198 0
      src/main/java/com/steerinfo/dil/model/BmsportHandlingFee.java
  18. 228 0
      src/main/java/com/steerinfo/dil/model/BmsshipDetailsOrder.java
  19. 198 0
      src/main/java/com/steerinfo/dil/model/BmsshipStatement.java
  20. 258 0
      src/main/java/com/steerinfo/dil/model/BmstrainDetailsOrder.java
  21. 273 0
      src/main/java/com/steerinfo/dil/model/BmstrainSettlement.java
  22. 183 0
      src/main/java/com/steerinfo/dil/model/BmstrainStatement.java
  23. 6 6
      src/main/java/com/steerinfo/dil/model/RmsConsignee.java
  24. 5 5
      src/main/java/com/steerinfo/dil/model/RmsMaterial.java
  25. 7 7
      src/main/java/com/steerinfo/dil/model/RmsSupplier.java
  26. 23 0
      src/main/java/com/steerinfo/dil/service/IBmsportHandlingFeeService.java
  27. 23 0
      src/main/java/com/steerinfo/dil/service/IBmsshipDetailsOrderService.java
  28. 23 0
      src/main/java/com/steerinfo/dil/service/IBmsshipStatementService.java
  29. 31 0
      src/main/java/com/steerinfo/dil/service/IBmstrainDetailsOrderService.java
  30. 23 0
      src/main/java/com/steerinfo/dil/service/IBmstrainSettlementService.java
  31. 37 0
      src/main/java/com/steerinfo/dil/service/IBmstrainStatementService.java
  32. 10 6
      src/main/java/com/steerinfo/dil/service/IBmstruckDetailsOrderService.java
  33. 1 2
      src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java
  34. 33 0
      src/main/java/com/steerinfo/dil/service/impl/BmsportHandlingFeeServiceImpl.java
  35. 36 0
      src/main/java/com/steerinfo/dil/service/impl/BmsshipDetailsOrderServiceImpl.java
  36. 32 0
      src/main/java/com/steerinfo/dil/service/impl/BmsshipStatementServiceImpl.java
  37. 44 0
      src/main/java/com/steerinfo/dil/service/impl/BmstrainDetailsOrderServiceImpl.java
  38. 32 0
      src/main/java/com/steerinfo/dil/service/impl/BmstrainSettlementServiceImpl.java
  39. 61 0
      src/main/java/com/steerinfo/dil/service/impl/BmstrainStatementServiceImpl.java
  40. 32 8
      src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java
  41. 4 3
      src/main/java/com/steerinfo/dil/service/impl/BmstruckStatementServiceImpl.java
  42. 2 3
      src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java
  43. 1 2
      src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java
  44. 1 2
      src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java
  45. 37 37
      src/main/resources/com/steerinfo/dil/mapper/AmsPurchaseOrderMapper.xml
  46. 369 0
      src/main/resources/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.xml
  47. 423 0
      src/main/resources/com/steerinfo/dil/mapper/BmsshipDetailsOrderMapper.xml
  48. 374 0
      src/main/resources/com/steerinfo/dil/mapper/BmsshipStatementMapper.xml
  49. 491 0
      src/main/resources/com/steerinfo/dil/mapper/BmstrainDetailsOrderMapper.xml
  50. 506 0
      src/main/resources/com/steerinfo/dil/mapper/BmstrainSettlementMapper.xml
  51. 375 0
      src/main/resources/com/steerinfo/dil/mapper/BmstrainStatementMapper.xml
  52. 67 19
      src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml
  53. 1 1
      src/main/resources/com/steerinfo/dil/mapper/BmstruckStatementMapper.xml
  54. 548 551
      src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml
  55. 32 31
      src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml
  56. 89 100
      src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

+ 1 - 0
pom.xml

@@ -111,6 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
+                        <table>AMS_PURCHASE_ORDER</table>
                     </tables>
                 </configuration>
                 <executions>

+ 59 - 0
src/main/java/com/steerinfo/dil/controller/BmsportHandlingFeeController.java

@@ -0,0 +1,59 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/bmsporthandlingfee")
+public class BmsportHandlingFeeController extends BaseRESTfulController {
+
+    @Autowired
+    BmstruckStatementServiceImpl bmstruckStatementService;
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getStatement")
+    public RESTfulResult getStatement(@RequestParam Integer statementId) {
+        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
+        return success(mapValue);
+    }
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
+    })
+    @PostMapping("/updateStatement")
+    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
+        int result = bmstruckStatementService.updateStatement(mapValue);
+        return success(result);
+    }
+
+}

+ 64 - 0
src/main/java/com/steerinfo/dil/controller/BmsshipDetailsOrderController.java

@@ -0,0 +1,64 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+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}/bmsshipdetailsorder")
+public class BmsshipDetailsOrderController extends BaseRESTfulController {
+
+    @Autowired
+    BmstruckDetailsOrderServiceImpl bmstruckDetailsOrderService;
+
+    /**
+     * 采购汽运详单接口
+     *
+     * @param detailsId
+     * @return
+     */
+    @ApiModelProperty(value = "采购汽运详单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "detailsId", value = "详单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getPurchaseDetailsOrder")
+    public RESTfulResult getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
+        Map<String,Object> mapValue = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
+        return success(mapValue);
+    }
+
+    /**
+     * 销售汽运详单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运详单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleDetailsOrder")
+    public RESTfulResult getSaleDetailsOrder(@RequestParam Integer statementId) {
+        List<Map<String, Object>> mapValue = bmstruckDetailsOrderService.getSaleDetailsOrder(statementId);
+        return success(mapValue);
+    }
+
+
+}

+ 59 - 0
src/main/java/com/steerinfo/dil/controller/BmsshipStatementController.java

@@ -0,0 +1,59 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/bmsshipstatement")
+public class BmsshipStatementController extends BaseRESTfulController {
+
+    @Autowired
+    BmstruckStatementServiceImpl bmstruckStatementService;
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getStatement")
+    public RESTfulResult getStatement(@RequestParam Integer statementId) {
+        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
+        return success(mapValue);
+    }
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
+    })
+    @PostMapping("/updateStatement")
+    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
+        int result = bmstruckStatementService.updateStatement(mapValue);
+        return success(result);
+    }
+
+}

+ 49 - 0
src/main/java/com/steerinfo/dil/controller/BmstrainDetailsOrderController.java

@@ -0,0 +1,49 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstrainDetailsOrderServiceImpl;
+import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+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}/bmstraindetailsorder")
+public class BmstrainDetailsOrderController extends BaseRESTfulController {
+
+    @Autowired
+    BmstrainDetailsOrderServiceImpl bmstrainDetailsOrderService;
+
+    /**
+     * 采购火运详单接口
+     *
+     * @param StatementId
+     * @return
+     */
+    @ApiModelProperty(value = "采购火运详单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "StatementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getPurchaseTrainDetailsOrder")
+    public RESTfulResult getPurchaseTrainDetailsOrder(@RequestParam Integer StatementId) {
+        List<Map<String, Object>> mapValue = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
+        return success(mapValue);
+    }
+
+
+}

+ 59 - 0
src/main/java/com/steerinfo/dil/controller/BmstrainSettlementController.java

@@ -0,0 +1,59 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/bmstrainsettlement")
+public class BmstrainSettlementController extends BaseRESTfulController {
+
+    @Autowired
+    BmstruckStatementServiceImpl bmstruckStatementService;
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getStatement")
+    public RESTfulResult getStatement(@RequestParam Integer statementId) {
+        Map<String,Object> mapValue = bmstruckStatementService.getStatement(statementId);
+        return success(mapValue);
+    }
+
+    /**
+     * 销售汽运账单接口
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
+    })
+    @PostMapping("/updateStatement")
+    public RESTfulResult updateStatement(@RequestBody Map<String,Object> mapValue) {
+        int result = bmstruckStatementService.updateStatement(mapValue);
+        return success(result);
+    }
+
+}

+ 61 - 0
src/main/java/com/steerinfo/dil/controller/BmstrainStatementController.java

@@ -0,0 +1,61 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.BmstrainStatement;
+import com.steerinfo.dil.service.impl.BmstrainStatementServiceImpl;
+import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/10/22 17:34
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/bmstrainstatement")
+public class BmstrainStatementController extends BaseRESTfulController {
+
+    @Autowired
+    BmstrainStatementServiceImpl bmstrainStatementService;
+
+    /**
+     * 火运账单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "火运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getTrainStatement")
+    public RESTfulResult getTrainStatement(@RequestParam Integer statementId) {
+        Map<String,Object> mapValue = bmstrainStatementService.getTrainStatement(statementId);
+        return success(mapValue);
+    }
+
+    /**
+     * 火运账单接口
+     *
+     * @param mapValue
+     * @return
+     */
+    @ApiModelProperty(value = "火运账单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
+    })
+    @PostMapping("/updateTrainStatement")
+    public RESTfulResult updateTrainStatement(@RequestBody Map<String,Object> mapValue) {
+        int result = bmstrainStatementService.updateTrainStatement(mapValue);
+        return success(result);
+    }
+
+}

+ 22 - 5
src/main/java/com/steerinfo/dil/controller/BmstruckDetailsOrderController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,18 +30,34 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
     BmstruckDetailsOrderServiceImpl bmstruckDetailsOrderService;
 
     /**
-     * 销售汽运详单接口
+     * 采购汽运详单接口
      *
      * @param detailsId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运详单接口")
+    @ApiModelProperty(value = "采购汽运详单接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "detailsId", value = "详单主键id", required = true, dataType = "Integer"),
     })
-    @PostMapping("/getDetailsOrder")
-    public RESTfulResult getDetailsOrder(@RequestParam Integer detailsId) {
-        Map<String,Object> mapValue = bmstruckDetailsOrderService.getDetailsOrder(detailsId);
+    @PostMapping("/getPurchaseDetailsOrder")
+    public RESTfulResult getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
+        Map<String,Object> mapValue = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
+        return success(mapValue);
+    }
+
+    /**
+     * 销售汽运详单接口
+     *
+     * @param statementId
+     * @return
+     */
+    @ApiModelProperty(value = "销售汽运详单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
+    })
+    @PostMapping("/getSaleDetailsOrder")
+    public RESTfulResult getSaleDetailsOrder(@RequestParam Integer statementId) {
+        List<Map<String, Object>> mapValue = bmstruckDetailsOrderService.getSaleDetailsOrder(statementId);
         return success(mapValue);
     }
 

+ 10 - 0
src/main/java/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.java

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

+ 10 - 0
src/main/java/com/steerinfo/dil/mapper/BmsshipDetailsOrderMapper.java

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

+ 10 - 0
src/main/java/com/steerinfo/dil/mapper/BmsshipStatementMapper.java

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

+ 15 - 0
src/main/java/com/steerinfo/dil/mapper/BmstrainDetailsOrderMapper.java

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.BmstrainDetailsOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BmstrainDetailsOrderMapper extends IBaseMapper<BmstrainDetailsOrder, BigDecimal> {
+    // 得到采购火运详单
+    List<Map<String, Object>> getPurchaseTrainDetailsOrder(BigDecimal statementId);
+}

+ 10 - 0
src/main/java/com/steerinfo/dil/mapper/BmstrainSettlementMapper.java

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

+ 18 - 0
src/main/java/com/steerinfo/dil/mapper/BmstrainStatementMapper.java

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.BmstrainStatement;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BmstrainStatementMapper extends IBaseMapper<BmstrainStatement, BigDecimal> {
+    // 采购火运账单
+    Map<String, Object> getTrainStatement(BigDecimal statementId);
+
+    // 得到
+    List<Map<String, Object>> getCarrierAndReceiver(BigDecimal statementId);
+}

+ 9 - 2
src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -3,12 +3,19 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.BmstruckDetailsOrder;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import java.math.*;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsOrder, BigDecimal> {
-    // 查询计费详单
-    Map<String, Object> getDetailsOrder(BigDecimal detailsId);
+    // 查询销售计费详单
+    List<Map<String, Object>> getSaleDetailsOrder(BigDecimal statementId);
+
+    // 查询采购计费详单
+    List<Map<String, Object>> getPurchaseDetailsOrder(BigDecimal detailsId);
+
+    // 查询采购汽运账单所需信息
+    Map<String, Object> getStatementMessage(Integer detailsId);
 }

+ 6 - 5
src/main/java/com/steerinfo/dil/model/AmsPurchaseOrder.java

@@ -3,6 +3,7 @@ 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;
 
@@ -105,10 +106,10 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 金蝶采购订单主键(EAS_PURCHASE_ORDER_ID,DECIMAL,0)
+     * 金蝶采购订单主键(EAS_PURCHASE_ORDER_ID,VARCHAR,50)
      */
     @ApiModelProperty(value="金蝶采购订单主键",required=false)
-    private BigDecimal easPurchaseOrderId;
+    private String easPurchaseOrderId;
 
     private static final long serialVersionUID = 1L;
 
@@ -250,12 +251,12 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
-    public BigDecimal getEasPurchaseOrderId() {
+    public String getEasPurchaseOrderId() {
         return easPurchaseOrderId;
     }
 
-    public void setEasPurchaseOrderId(BigDecimal easPurchaseOrderId) {
-        this.easPurchaseOrderId = easPurchaseOrderId;
+    public void setEasPurchaseOrderId(String easPurchaseOrderId) {
+        this.easPurchaseOrderId = easPurchaseOrderId == null ? null : easPurchaseOrderId.trim();
     }
 
     @Override

+ 198 - 0
src/main/java/com/steerinfo/dil/model/BmsportHandlingFee.java

@@ -0,0 +1,198 @@
+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 BmsportHandlingFee implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(FEE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal feeId;
+
+    /**
+     * 原料物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="原料物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 外轮船名(FEE_FOREIGN_SHIP_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="外轮船名",required=false)
+    private String feeForeignShipName;
+
+    /**
+     * 物资吨位(FEE_MATERIAL_TONNAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资吨位",required=false)
+    private BigDecimal feeMaterialTonnage;
+
+    /**
+     * 单价ID(PRICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 港口装卸费=港口商检吨位*单价(FEE_VALUE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="港口装卸费=港口商检吨位*单价",required=false)
+    private BigDecimal feeValue;
+
+    /**
+     * 记录创建人(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.feeId;
+    }
+
+    @Override
+    public void setId(BigDecimal feeId) {
+        this.feeId = feeId;
+    }
+
+    public BigDecimal getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(BigDecimal feeId) {
+        this.feeId = feeId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public String getFeeForeignShipName() {
+        return feeForeignShipName;
+    }
+
+    public void setFeeForeignShipName(String feeForeignShipName) {
+        this.feeForeignShipName = feeForeignShipName == null ? null : feeForeignShipName.trim();
+    }
+
+    public BigDecimal getFeeMaterialTonnage() {
+        return feeMaterialTonnage;
+    }
+
+    public void setFeeMaterialTonnage(BigDecimal feeMaterialTonnage) {
+        this.feeMaterialTonnage = feeMaterialTonnage;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getFeeValue() {
+        return feeValue;
+    }
+
+    public void setFeeValue(BigDecimal feeValue) {
+        this.feeValue = feeValue;
+    }
+
+    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(", feeId=").append(feeId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", feeForeignShipName=").append(feeForeignShipName);
+        sb.append(", feeMaterialTonnage=").append(feeMaterialTonnage);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", feeValue=").append(feeValue);
+        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();
+    }
+}

+ 228 - 0
src/main/java/com/steerinfo/dil/model/BmsshipDetailsOrder.java

@@ -0,0 +1,228 @@
+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 BmsshipDetailsOrder implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(DETAILS_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal detailsId;
+
+    /**
+     * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="采购订单ID",required=false)
+    private BigDecimal purchaseOrderId;
+
+    /**
+     * 详单号(DETAILS_NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="详单号",required=false)
+    private String detailsNo;
+
+    /**
+     * 详单时间(DETAILS_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="详单时间",required=false)
+    private Date detailsTime;
+
+    /**
+     * 费用类别(0:水运费:1:物流途损超标扣款:2:水分检测费)(DETAILS_FEE_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="费用类别(0:水运费:1:物流途损超标扣款:2:水分检测费)",required=false)
+    private String detailsFeeType;
+
+    /**
+     * 金额(DETAILS_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="金额",required=false)
+    private BigDecimal detailsAmount;
+
+    /**
+     * 是否已开账单(0:未开,1:已开)(WETHER_TO_STATEMENT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否已开账单(0:未开,1:已开)",required=false)
+    private BigDecimal wetherToStatement;
+
+    /**
+     * 车运到厂的总实绩ID(TRUCK_RESULT_TOTAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="车运到厂的总实绩ID",required=false)
+    private BigDecimal truckResultTotalId;
+
+    /**
+     * 记录创建人(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.detailsId;
+    }
+
+    @Override
+    public void setId(BigDecimal detailsId) {
+        this.detailsId = detailsId;
+    }
+
+    public BigDecimal getDetailsId() {
+        return detailsId;
+    }
+
+    public void setDetailsId(BigDecimal detailsId) {
+        this.detailsId = detailsId;
+    }
+
+    public BigDecimal getPurchaseOrderId() {
+        return purchaseOrderId;
+    }
+
+    public void setPurchaseOrderId(BigDecimal purchaseOrderId) {
+        this.purchaseOrderId = purchaseOrderId;
+    }
+
+    public String getDetailsNo() {
+        return detailsNo;
+    }
+
+    public void setDetailsNo(String detailsNo) {
+        this.detailsNo = detailsNo == null ? null : detailsNo.trim();
+    }
+
+    public Date getDetailsTime() {
+        return detailsTime;
+    }
+
+    public void setDetailsTime(Date detailsTime) {
+        this.detailsTime = detailsTime;
+    }
+
+    public String getDetailsFeeType() {
+        return detailsFeeType;
+    }
+
+    public void setDetailsFeeType(String detailsFeeType) {
+        this.detailsFeeType = detailsFeeType == null ? null : detailsFeeType.trim();
+    }
+
+    public BigDecimal getDetailsAmount() {
+        return detailsAmount;
+    }
+
+    public void setDetailsAmount(BigDecimal detailsAmount) {
+        this.detailsAmount = detailsAmount;
+    }
+
+    public BigDecimal getWetherToStatement() {
+        return wetherToStatement;
+    }
+
+    public void setWetherToStatement(BigDecimal wetherToStatement) {
+        this.wetherToStatement = wetherToStatement;
+    }
+
+    public BigDecimal getTruckResultTotalId() {
+        return truckResultTotalId;
+    }
+
+    public void setTruckResultTotalId(BigDecimal truckResultTotalId) {
+        this.truckResultTotalId = truckResultTotalId;
+    }
+
+    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(", detailsId=").append(detailsId);
+        sb.append(", purchaseOrderId=").append(purchaseOrderId);
+        sb.append(", detailsNo=").append(detailsNo);
+        sb.append(", detailsTime=").append(detailsTime);
+        sb.append(", detailsFeeType=").append(detailsFeeType);
+        sb.append(", detailsAmount=").append(detailsAmount);
+        sb.append(", wetherToStatement=").append(wetherToStatement);
+        sb.append(", truckResultTotalId=").append(truckResultTotalId);
+        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();
+    }
+}

+ 198 - 0
src/main/java/com/steerinfo/dil/model/BmsshipStatement.java

@@ -0,0 +1,198 @@
+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 BmsshipStatement implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(STATEMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal statementId;
+
+    /**
+     * 账单编号(STATEMENT_NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="账单编号",required=false)
+    private String statementNo;
+
+    /**
+     * 支付单位ID(STATEMENT_SHIPPER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="支付单位ID",required=false)
+    private BigDecimal statementShipperId;
+
+    /**
+     * 总金额(STATEMENT_TOTAL_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="总金额",required=false)
+    private BigDecimal statementTotalAmount;
+
+    /**
+     * 账单日期(默认每月截至20号)(STATEMENT_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="账单日期(默认每月截至20号)",required=false)
+    private Date statementDate;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 费用类型:水运费,途损费,水分检测费(STATEMENT_TYPE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="费用类型:水运费,途损费,水分检测费",required=false)
+    private String statementType;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.statementId;
+    }
+
+    @Override
+    public void setId(BigDecimal statementId) {
+        this.statementId = statementId;
+    }
+
+    public BigDecimal getStatementId() {
+        return statementId;
+    }
+
+    public void setStatementId(BigDecimal statementId) {
+        this.statementId = statementId;
+    }
+
+    public String getStatementNo() {
+        return statementNo;
+    }
+
+    public void setStatementNo(String statementNo) {
+        this.statementNo = statementNo == null ? null : statementNo.trim();
+    }
+
+    public BigDecimal getStatementShipperId() {
+        return statementShipperId;
+    }
+
+    public void setStatementShipperId(BigDecimal statementShipperId) {
+        this.statementShipperId = statementShipperId;
+    }
+
+    public BigDecimal getStatementTotalAmount() {
+        return statementTotalAmount;
+    }
+
+    public void setStatementTotalAmount(BigDecimal statementTotalAmount) {
+        this.statementTotalAmount = statementTotalAmount;
+    }
+
+    public Date getStatementDate() {
+        return statementDate;
+    }
+
+    public void setStatementDate(Date statementDate) {
+        this.statementDate = statementDate;
+    }
+
+    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 getStatementType() {
+        return statementType;
+    }
+
+    public void setStatementType(String statementType) {
+        this.statementType = statementType == null ? null : statementType.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", statementId=").append(statementId);
+        sb.append(", statementNo=").append(statementNo);
+        sb.append(", statementShipperId=").append(statementShipperId);
+        sb.append(", statementTotalAmount=").append(statementTotalAmount);
+        sb.append(", statementDate=").append(statementDate);
+        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(", statementType=").append(statementType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 258 - 0
src/main/java/com/steerinfo/dil/model/BmstrainDetailsOrder.java

@@ -0,0 +1,258 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="采购火运计费详单")
+public class BmstrainDetailsOrder implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(DETAILS_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal detailsId;
+
+    /**
+     * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="采购订单ID",required=false)
+    private BigDecimal purchaseOrderId;
+
+    /**
+     * 详单号(DETAILS_NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="详单号",required=false)
+    private String detailsNo;
+
+    /**
+     * 详单时间(DETAILS_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="详单时间",required=false)
+    private Date detailsTime;
+
+    /**
+     * 单价ID(PRICE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 金额(保留两位小数)(DETAILS_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="金额(保留两位小数)",required=false)
+    private BigDecimal detailsAmount;
+
+    /**
+     * 下浮后金额=总金额*80%(保留两位小数)(DETAILS_FLOAT_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="下浮后金额=总金额*80%(保留两位小数)",required=false)
+    private BigDecimal detailsFloatAmount;
+
+    /**
+     * 保证金=总金额*20%(保留两位小数)(DETAILS_MAGIN_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="保证金=总金额*20%(保留两位小数)",required=false)
+    private BigDecimal detailsMaginAmount;
+
+    /**
+     * 记录创建人(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:已生成)(WETHER_TO_STATEMENT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否已生成账单(0:未生成;1:已生成)",required=false)
+    private BigDecimal wetherToStatement;
+
+    /**
+     * 火运装车实绩id(TRAIN_LOADING_RESULT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="火运装车实绩id",required=false)
+    private BigDecimal trainLoadingResultId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.detailsId;
+    }
+
+    @Override
+    public void setId(BigDecimal detailsId) {
+        this.detailsId = detailsId;
+    }
+
+    public BigDecimal getDetailsId() {
+        return detailsId;
+    }
+
+    public void setDetailsId(BigDecimal detailsId) {
+        this.detailsId = detailsId;
+    }
+
+    public BigDecimal getPurchaseOrderId() {
+        return purchaseOrderId;
+    }
+
+    public void setPurchaseOrderId(BigDecimal purchaseOrderId) {
+        this.purchaseOrderId = purchaseOrderId;
+    }
+
+    public String getDetailsNo() {
+        return detailsNo;
+    }
+
+    public void setDetailsNo(String detailsNo) {
+        this.detailsNo = detailsNo == null ? null : detailsNo.trim();
+    }
+
+    public Date getDetailsTime() {
+        return detailsTime;
+    }
+
+    public void setDetailsTime(Date detailsTime) {
+        this.detailsTime = detailsTime;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getDetailsAmount() {
+        return detailsAmount;
+    }
+
+    public void setDetailsAmount(BigDecimal detailsAmount) {
+        this.detailsAmount = detailsAmount;
+    }
+
+    public BigDecimal getDetailsFloatAmount() {
+        return detailsFloatAmount;
+    }
+
+    public void setDetailsFloatAmount(BigDecimal detailsFloatAmount) {
+        this.detailsFloatAmount = detailsFloatAmount;
+    }
+
+    public BigDecimal getDetailsMaginAmount() {
+        return detailsMaginAmount;
+    }
+
+    public void setDetailsMaginAmount(BigDecimal detailsMaginAmount) {
+        this.detailsMaginAmount = detailsMaginAmount;
+    }
+
+    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 getWetherToStatement() {
+        return wetherToStatement;
+    }
+
+    public void setWetherToStatement(BigDecimal wetherToStatement) {
+        this.wetherToStatement = wetherToStatement;
+    }
+
+    public BigDecimal getTrainLoadingResultId() {
+        return trainLoadingResultId;
+    }
+
+    public void setTrainLoadingResultId(BigDecimal trainLoadingResultId) {
+        this.trainLoadingResultId = trainLoadingResultId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", detailsId=").append(detailsId);
+        sb.append(", purchaseOrderId=").append(purchaseOrderId);
+        sb.append(", detailsNo=").append(detailsNo);
+        sb.append(", detailsTime=").append(detailsTime);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", detailsAmount=").append(detailsAmount);
+        sb.append(", detailsFloatAmount=").append(detailsFloatAmount);
+        sb.append(", detailsMaginAmount=").append(detailsMaginAmount);
+        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(", wetherToStatement=").append(wetherToStatement);
+        sb.append(", trainLoadingResultId=").append(trainLoadingResultId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 273 - 0
src/main/java/com/steerinfo/dil/model/BmstrainSettlement.java

@@ -0,0 +1,273 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="火运结算")
+public class BmstrainSettlement implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(SETTLEMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal settlementId;
+
+    /**
+     * 日期(SETTLEMENT_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="日期",required=false)
+    private Date settlementDate;
+
+    /**
+     * 当日发生车皮数(SETTLEMENT_DAY_WAGONS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当日发生车皮数",required=false)
+    private BigDecimal settlementDayWagons;
+
+    /**
+     * 当日发生吨位(SETTLEMENT_DAY_TONNAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当日发生吨位",required=false)
+    private BigDecimal settlementDayTonnage;
+
+    /**
+     * 当日产生运费(SETTLEMENT_DAY_TRANSPORT_COST,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当日产生运费",required=false)
+    private BigDecimal settlementDayTransportCost;
+
+    /**
+     * 当日下浮后运费(SETTLEMENT_DAY_FLOAT_COST,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当日下浮后运费",required=false)
+    private BigDecimal settlementDayFloatCost;
+
+    /**
+     * 当日保证金(SETTLEMENT_DAY_MARGIN,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当日保证金",required=false)
+    private BigDecimal settlementDayMargin;
+
+    /**
+     * 当月累计车皮数(SETTLEMENT_MONTH_WAGONS,DECIMAL,38)
+     */
+    @ApiModelProperty(value="当月累计车皮数",required=false)
+    private BigDecimal settlementMonthWagons;
+
+    /**
+     * 当月累计吨位(SETTLEMENT_MONTH_TONNAGE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当月累计吨位",required=false)
+    private BigDecimal settlementMonthTonnage;
+
+    /**
+     * 当月累计运费(SETTLEMENT_MONTH_TOTAL_MONTH,DECIMAL,0)
+     */
+    @ApiModelProperty(value="当月累计运费",required=false)
+    private BigDecimal settlementMonthTotalMonth;
+
+    /**
+     * 记录创建人(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.settlementId;
+    }
+
+    @Override
+    public void setId(BigDecimal settlementId) {
+        this.settlementId = settlementId;
+    }
+
+    public BigDecimal getSettlementId() {
+        return settlementId;
+    }
+
+    public void setSettlementId(BigDecimal settlementId) {
+        this.settlementId = settlementId;
+    }
+
+    public Date getSettlementDate() {
+        return settlementDate;
+    }
+
+    public void setSettlementDate(Date settlementDate) {
+        this.settlementDate = settlementDate;
+    }
+
+    public BigDecimal getSettlementDayWagons() {
+        return settlementDayWagons;
+    }
+
+    public void setSettlementDayWagons(BigDecimal settlementDayWagons) {
+        this.settlementDayWagons = settlementDayWagons;
+    }
+
+    public BigDecimal getSettlementDayTonnage() {
+        return settlementDayTonnage;
+    }
+
+    public void setSettlementDayTonnage(BigDecimal settlementDayTonnage) {
+        this.settlementDayTonnage = settlementDayTonnage;
+    }
+
+    public BigDecimal getSettlementDayTransportCost() {
+        return settlementDayTransportCost;
+    }
+
+    public void setSettlementDayTransportCost(BigDecimal settlementDayTransportCost) {
+        this.settlementDayTransportCost = settlementDayTransportCost;
+    }
+
+    public BigDecimal getSettlementDayFloatCost() {
+        return settlementDayFloatCost;
+    }
+
+    public void setSettlementDayFloatCost(BigDecimal settlementDayFloatCost) {
+        this.settlementDayFloatCost = settlementDayFloatCost;
+    }
+
+    public BigDecimal getSettlementDayMargin() {
+        return settlementDayMargin;
+    }
+
+    public void setSettlementDayMargin(BigDecimal settlementDayMargin) {
+        this.settlementDayMargin = settlementDayMargin;
+    }
+
+    public BigDecimal getSettlementMonthWagons() {
+        return settlementMonthWagons;
+    }
+
+    public void setSettlementMonthWagons(BigDecimal settlementMonthWagons) {
+        this.settlementMonthWagons = settlementMonthWagons;
+    }
+
+    public BigDecimal getSettlementMonthTonnage() {
+        return settlementMonthTonnage;
+    }
+
+    public void setSettlementMonthTonnage(BigDecimal settlementMonthTonnage) {
+        this.settlementMonthTonnage = settlementMonthTonnage;
+    }
+
+    public BigDecimal getSettlementMonthTotalMonth() {
+        return settlementMonthTotalMonth;
+    }
+
+    public void setSettlementMonthTotalMonth(BigDecimal settlementMonthTotalMonth) {
+        this.settlementMonthTotalMonth = settlementMonthTotalMonth;
+    }
+
+    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(", settlementId=").append(settlementId);
+        sb.append(", settlementDate=").append(settlementDate);
+        sb.append(", settlementDayWagons=").append(settlementDayWagons);
+        sb.append(", settlementDayTonnage=").append(settlementDayTonnage);
+        sb.append(", settlementDayTransportCost=").append(settlementDayTransportCost);
+        sb.append(", settlementDayFloatCost=").append(settlementDayFloatCost);
+        sb.append(", settlementDayMargin=").append(settlementDayMargin);
+        sb.append(", settlementMonthWagons=").append(settlementMonthWagons);
+        sb.append(", settlementMonthTonnage=").append(settlementMonthTonnage);
+        sb.append(", settlementMonthTotalMonth=").append(settlementMonthTotalMonth);
+        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();
+    }
+}

+ 183 - 0
src/main/java/com/steerinfo/dil/model/BmstrainStatement.java

@@ -0,0 +1,183 @@
+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 BmstrainStatement implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(STATEMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal statementId;
+
+    /**
+     * 账单编号(STATEMENT_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="账单编号",required=true)
+    private String statementNo;
+
+    /**
+     * 支付单位ID(STATEMENT_SHIPPER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="支付单位ID",required=false)
+    private BigDecimal statementShipperId;
+
+    /**
+     * 总金额(STATEMENT_TOTAL_AMOUNT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="总金额",required=false)
+    private BigDecimal statementTotalAmount;
+
+    /**
+     * 账单日期(21号-月底最后一天,月初-10号,10号-20号)(STATEMENT_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="账单日期(21号-月底最后一天,月初-10号,10号-20号)",required=false)
+    private Date statementDate;
+
+    /**
+     * 记录创建人(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.statementId;
+    }
+
+    @Override
+    public void setId(BigDecimal statementId) {
+        this.statementId = statementId;
+    }
+
+    public BigDecimal getStatementId() {
+        return statementId;
+    }
+
+    public void setStatementId(BigDecimal statementId) {
+        this.statementId = statementId;
+    }
+
+    public String getStatementNo() {
+        return statementNo;
+    }
+
+    public void setStatementNo(String statementNo) {
+        this.statementNo = statementNo == null ? null : statementNo.trim();
+    }
+
+    public BigDecimal getStatementShipperId() {
+        return statementShipperId;
+    }
+
+    public void setStatementShipperId(BigDecimal statementShipperId) {
+        this.statementShipperId = statementShipperId;
+    }
+
+    public BigDecimal getStatementTotalAmount() {
+        return statementTotalAmount;
+    }
+
+    public void setStatementTotalAmount(BigDecimal statementTotalAmount) {
+        this.statementTotalAmount = statementTotalAmount;
+    }
+
+    public Date getStatementDate() {
+        return statementDate;
+    }
+
+    public void setStatementDate(Date statementDate) {
+        this.statementDate = statementDate;
+    }
+
+    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(", statementId=").append(statementId);
+        sb.append(", statementNo=").append(statementNo);
+        sb.append(", statementShipperId=").append(statementShipperId);
+        sb.append(", statementTotalAmount=").append(statementTotalAmount);
+        sb.append(", statementDate=").append(statementDate);
+        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();
+    }
+}

+ 6 - 6
src/main/java/com/steerinfo/dil/model/RmsConsignee.java

@@ -111,12 +111,12 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
     private BigDecimal deleted;
 
     /**
-     * 金蝶收获客户主键ID(EAS_CONSIGNEE_ID,DECIMAL,0)
+     * 金蝶收获客户主键ID(EAS_CONSIGNEE_ID,VARCHAR,50)
      */
     @ApiModelProperty(value="金蝶收获客户主键ID",required=false)
-    private BigDecimal easConsigneeId;
+    private String easConsigneeId;
 
-    private static final long serialVersionUID = 1L;
+    private static final Long serialVersionUID = 1L;
 
     @Override
     public BigDecimal getId() {
@@ -264,12 +264,12 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
-    public BigDecimal getEasConsigneeId() {
+    public String getEasConsigneeId() {
         return easConsigneeId;
     }
 
-    public void setEasConsigneeId(BigDecimal easConsigneeId) {
-        this.easConsigneeId = easConsigneeId;
+    public void setEasConsigneeId(String easConsigneeId) {
+        this.easConsigneeId = easConsigneeId == null ? null : easConsigneeId.trim();
     }
 
     @Override

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

@@ -88,10 +88,10 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
     private String insertUpdateRemark;
 
     /**
-     * 金蝶物资主键ID(EAS_MATERIAL_ID,DECIMAL,0)
+     * 金蝶物资主键ID(EAS_MATERIAL_ID,VARCHAR,50)
      */
     @ApiModelProperty(value="金蝶物资主键ID",required=false)
-    private BigDecimal easMaterialId;
+    private String easMaterialId;
 
     /**
      * 逻辑删除(DELETED,DECIMAL,0)
@@ -215,12 +215,12 @@ public class RmsMaterial implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
-    public BigDecimal getEasMaterialId() {
+    public String getEasMaterialId() {
         return easMaterialId;
     }
 
-    public void setEasMaterialId(BigDecimal easMaterialId) {
-        this.easMaterialId = easMaterialId;
+    public void setEasMaterialId(String easMaterialId) {
+        this.easMaterialId = easMaterialId == null ? null : easMaterialId.trim();
     }
 
     public BigDecimal getDeleted() {

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

@@ -76,9 +76,9 @@ public class RmsSupplier implements IBasePO<BigDecimal> {
     private String supplierAccountBlank;
 
     /**
-     * 税号(SUPPLIER_DUTY_PARAGRAPH,VARCHAR,32)
+     * 供应商代码(SUPPLIER_DUTY_PARAGRAPH,VARCHAR,32)
      */
-    @ApiModelProperty(value="税号",required=false)
+    @ApiModelProperty(value="供应商代码",required=false)
     private String supplierDutyParagraph;
 
     /**
@@ -172,10 +172,10 @@ public class RmsSupplier implements IBasePO<BigDecimal> {
     private String insertUpdateRemark;
 
     /**
-     * 金蝶供应商主键ID(EAS_SUPPLIER_ID,DECIMAL,0)
+     * 金蝶供应商主键ID(EAS_SUPPLIER_ID,VARCHAR,50)
      */
     @ApiModelProperty(value="金蝶供应商主键ID",required=false)
-    private BigDecimal easSupplierId;
+    private String easSupplierId;
 
     /**
      * 逻辑删除(DELETED,DECIMAL,0)
@@ -423,12 +423,12 @@ public class RmsSupplier implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
-    public BigDecimal getEasSupplierId() {
+    public String getEasSupplierId() {
         return easSupplierId;
     }
 
-    public void setEasSupplierId(BigDecimal easSupplierId) {
-        this.easSupplierId = easSupplierId;
+    public void setEasSupplierId(String easSupplierId) {
+        this.easSupplierId = easSupplierId == null ? null : easSupplierId.trim();
     }
 
     public BigDecimal getDeleted() {

+ 23 - 0
src/main/java/com/steerinfo/dil/service/IBmsportHandlingFeeService.java

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

+ 23 - 0
src/main/java/com/steerinfo/dil/service/IBmsshipDetailsOrderService.java

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

+ 23 - 0
src/main/java/com/steerinfo/dil/service/IBmsshipStatementService.java

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

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

@@ -0,0 +1,31 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.BmstrainDetailsOrder;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * BmstrainDetailsOrder服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 08:05
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmstrainDetailsOrder服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IBmstrainDetailsOrderService {
+
+    /**
+     * 采购火运详单信息
+     * @param StatementId
+     * @return
+     */
+    List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer StatementId);
+}

+ 23 - 0
src/main/java/com/steerinfo/dil/service/IBmstrainSettlementService.java

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

+ 37 - 0
src/main/java/com/steerinfo/dil/service/IBmstrainStatementService.java

@@ -0,0 +1,37 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.BmstrainStatement;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * BmstrainStatement服务接口:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 08:15
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmstrainStatement服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IBmstrainStatementService {
+
+    /**
+     * 得到火运账单信息
+     * @param statementId
+     * @return
+     */
+    Map<String, Object> getTrainStatement(Integer statementId);
+
+    /**
+     * 修改火运账单
+     * @param mapValue
+     * @return
+     */
+    int updateTrainStatement(Map<String, Object> mapValue);
+}

+ 10 - 6
src/main/java/com/steerinfo/dil/service/IBmstruckDetailsOrderService.java

@@ -1,9 +1,6 @@
 package com.steerinfo.dil.service;
 
-import com.steerinfo.framework.service.IBaseService;
-import com.steerinfo.dil.model.BmstruckDetailsOrder;
-import java.util.Date;
-import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -22,9 +19,16 @@ import java.util.Map;
 public interface IBmstruckDetailsOrderService {
 
     /**
-     * 查询汽运详单
+     * 查询采购汽运详单
      * @param detailsId
      * @return
      */
-    Map<String, Object> getDetailsOrder(Integer detailsId);
+    Map<String, Object> getPurchaseDetailsOrder(Integer detailsId);
+
+    /**
+     * 查询销售汽运详单
+     * @param statementId
+     * @return
+     */
+    List<Map<String, Object>> getSaleDetailsOrder(Integer statementId);
 }

+ 1 - 2
src/main/java/com/steerinfo/dil/service/impl/AmsPurchaseOrderServiceImpl.java

@@ -40,8 +40,7 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
     public int operationPurchaseOrder(Map<String, Object> mapVal) {
         int result = 0;
         // 得到金蝶采购主键id
-        Integer EASPurchaseIdValue = (Integer) mapVal.get("EASPurchaseId");
-        BigDecimal EASPurchaseId = new BigDecimal(EASPurchaseIdValue);
+        String EASPurchaseId = (String) mapVal.get("EASPurchaseId");
         // 得到采购订单号
         String purchaseOrderNo = (String) mapVal.get("purchaseOrderNo");
         // 得到物资唯一编号

+ 33 - 0
src/main/java/com/steerinfo/dil/service/impl/BmsportHandlingFeeServiceImpl.java

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmsportHandlingFee;
+import com.steerinfo.dil.mapper.BmsportHandlingFeeMapper;
+import com.steerinfo.dil.service.IBmsportHandlingFeeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * BmsportHandlingFee服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 07:43
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmsportHandlingFee服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmsportHandlingFeeService")
+public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService {
+
+    @Autowired
+    private BmsportHandlingFeeMapper bmsportHandlingFeeMapper;
+
+
+}

+ 36 - 0
src/main/java/com/steerinfo/dil/service/impl/BmsshipDetailsOrderServiceImpl.java

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmsshipDetailsOrder;
+import com.steerinfo.dil.mapper.BmsshipDetailsOrderMapper;
+import com.steerinfo.dil.service.IBmsshipDetailsOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * BmsshipDetailsOrder服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 07:29
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmsshipDetailsOrder服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmsshipDetailsOrderService")
+public class BmsshipDetailsOrderServiceImpl extends BaseServiceImpl<BmsshipDetailsOrder, BigDecimal> implements IBmsshipDetailsOrderService {
+
+    @Autowired
+    private BmsshipDetailsOrderMapper bmsshipDetailsOrderMapper;
+
+    @Override
+    protected IBaseMapper<BmsshipDetailsOrder, BigDecimal> getMapper() {
+        return bmsshipDetailsOrderMapper;
+    }
+}

+ 32 - 0
src/main/java/com/steerinfo/dil/service/impl/BmsshipStatementServiceImpl.java

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmsshipStatement;
+import com.steerinfo.dil.mapper.BmsshipStatementMapper;
+import com.steerinfo.dil.service.IBmsshipStatementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * BmsshipStatement服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 07:35
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmsshipStatement服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmsshipStatementService")
+public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
+
+    @Autowired
+    private BmsshipStatementMapper bmsshipStatementMapper;
+
+}

+ 44 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstrainDetailsOrderServiceImpl.java

@@ -0,0 +1,44 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmstrainDetailsOrder;
+import com.steerinfo.dil.mapper.BmstrainDetailsOrderMapper;
+import com.steerinfo.dil.service.IBmstrainDetailsOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * BmstrainDetailsOrder服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 08:05
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmstrainDetailsOrder服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmstrainDetailsOrderService")
+public class BmstrainDetailsOrderServiceImpl implements IBmstrainDetailsOrderService {
+
+    @Autowired
+    private BmstrainDetailsOrderMapper bmstrainDetailsOrderMapper;
+
+    /**
+     * 采购火运详单信息
+     * @param StatementId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer StatementId) {
+        List<Map<String, Object>> mapList = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(StatementId));
+        return mapList;
+    }
+}

+ 32 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstrainSettlementServiceImpl.java

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmstrainSettlement;
+import com.steerinfo.dil.mapper.BmstrainSettlementMapper;
+import com.steerinfo.dil.service.IBmstrainSettlementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * BmstrainSettlement服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 08:11
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmstrainSettlement服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmstrainSettlementService")
+public class BmstrainSettlementServiceImpl implements IBmstrainSettlementService {
+
+    @Autowired
+    private BmstrainSettlementMapper bmstrainSettlementMapper;
+
+}

+ 61 - 0
src/main/java/com/steerinfo/dil/service/impl/BmstrainStatementServiceImpl.java

@@ -0,0 +1,61 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.BmstrainStatement;
+import com.steerinfo.dil.mapper.BmstrainStatementMapper;
+import com.steerinfo.dil.service.IBmstrainStatementService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * BmstrainStatement服务实现:
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-05 08:15
+ * 类描述
+ * 修订历史:
+ * 日期:2021-11-05
+ * 作者:generator
+ * 参考:
+ * 描述:BmstrainStatement服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "bmstrainStatementService")
+public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
+
+    @Autowired
+    private BmstrainStatementMapper bmstrainStatementMapper;
+
+    /**
+     * 得到火运账单信息
+     * @param statementId
+     * @return
+     */
+    @Override
+    public Map<String, Object> getTrainStatement(Integer statementId) {
+        Map<String, Object> mapValue = bmstrainStatementMapper.getTrainStatement(new BigDecimal(statementId));
+        List<Map<String,Object>> mapList = bmstrainStatementMapper.getCarrierAndReceiver(new BigDecimal(statementId));
+        Map<String, Object> map = mapList.get(0);
+        String amountType = "采购火运";
+        String collectionName = "成都铁路局";
+        mapValue.put("amountType",amountType);
+        mapValue.put("collectionName",collectionName);
+        mapValue.putAll(map);
+        return mapValue;
+    }
+
+    /**
+     * 修改火运账单
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public int updateTrainStatement(Map<String, Object> mapValue) {
+        return 0;
+    }
+}

+ 32 - 8
src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -1,14 +1,14 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.dil.model.BmstruckDetailsOrder;
 import com.steerinfo.dil.mapper.BmstruckDetailsOrderMapper;
 import com.steerinfo.dil.service.IBmstruckDetailsOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Date;
+
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -31,13 +31,37 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     private BmstruckDetailsOrderMapper bmstruckDetailsOrderMapper;
 
     /**
-     * 查询汽运详单
+     * 查询采购汽运详单
      * @param detailsId
      * @return
      */
     @Override
-    public Map<String, Object> getDetailsOrder(Integer detailsId) {
-        Map<String,Object> mapValue = bmstruckDetailsOrderMapper.getDetailsOrder(new BigDecimal(detailsId));
-        return mapValue;
+    public Map<String, Object> getPurchaseDetailsOrder(Integer detailsId) {
+        List<Map<String, Object>> mapList = bmstruckDetailsOrderMapper.getPurchaseDetailsOrder(new BigDecimal(detailsId));
+        String amountType = "采购汽运";
+        Map<String,Object> map = new HashMap<>();
+        String statementNumber = "";
+        Date statementTime = (Date) (mapList.get(0).get("detailsTime"));
+        BigDecimal detailsAmount = (BigDecimal) (mapList.get(0).get("detailsAmount"));
+        Double statementExcludTax = detailsAmount.doubleValue();
+        Map<String,Object> statementMap = bmstruckDetailsOrderMapper.getStatementMessage(detailsId);
+        map.put("statementNumber",statementNumber);
+        map.put("statementTime",statementTime);
+        map.put("amountType",amountType);
+        map.put("statementExcludTax",statementExcludTax);
+        map.put("mapList",mapList);
+        map.putAll(statementMap);
+        return map;
+    }
+
+    /**
+     * 查询销售汽运详单
+     * @param statementId
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getSaleDetailsOrder(Integer statementId) {
+        List<Map<String, Object>> mapList = bmstruckDetailsOrderMapper.getSaleDetailsOrder(new BigDecimal(statementId));
+        return mapList;
     }
 }

+ 4 - 3
src/main/java/com/steerinfo/dil/service/impl/BmstruckStatementServiceImpl.java

@@ -4,7 +4,6 @@ import com.steerinfo.dil.mapper.BmstruckStatementMapper;
 import com.steerinfo.dil.service.IBmstruckStatementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Date;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
@@ -37,6 +36,8 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
     public Map<String, Object> getStatement(Integer statementId) {
         Map<String,Object> mapValue = bmstruckStatementMapper.getStatement(new BigDecimal(statementId));
         List<Map<String,Object>> mapList = bmstruckStatementMapper.getCarrierAndReceiver(new BigDecimal(statementId));
+        String amountType = "销售汽运";
+        mapValue.put("amountType",amountType);
         Map<String, Object> map = mapList.get(0);
         mapValue.putAll(map);
         return mapValue;
@@ -50,8 +51,8 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
     @Override
     public int updateStatement(Map<String, Object> mapValue) {
         String statementNumber = (String) mapValue.get("statementNumber");
-        String detailsNumber = (String) mapValue.get("detailsNumber");
-        mapValue.get("");
+        List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) mapValue.get("detailsNumberList");
+        Double amount = (Double) mapValue.get("amount");
         String remark = (String) mapValue.get("remark");
         return 0;
     }

+ 2 - 3
src/main/java/com/steerinfo/dil/service/impl/RmsConsigneeServiceImpl.java

@@ -5,7 +5,6 @@ import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.IRmsConsigneeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import java.util.Date;
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
@@ -38,8 +37,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
     @Override
     public int operationConsignee(Map<String, Object> mapVal) {
         // 得到金蝶收货客户主键id
-        Integer EASConsigneeIdValue = (Integer) mapVal.get("EASConsigneeId");
-        BigDecimal EASConsigneeId = new BigDecimal(EASConsigneeIdValue);
+        String EASConsigneeId = (String) mapVal.get("EASConsigneeId");
         // 得到收货人名称
         String consigneeCompanyName = (String) mapVal.get("consigneeCompanyName");
         // 得到收货人简称
@@ -58,6 +56,7 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         BigDecimal deleted = new BigDecimal(0);
         map.put("deleted",deleted);
         RmsConsignee rmsConsignee = new RmsConsignee();
+        rmsConsignee.setEasConsigneeId(EASConsigneeId);
         rmsConsignee.setConsigneeCompanyName(consigneeCompanyName);
         rmsConsignee.setConsigneeAbbreviation(consigneeAbbreviation);
         rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);

+ 1 - 2
src/main/java/com/steerinfo/dil/service/impl/RmsMaterialServiceImpl.java

@@ -46,8 +46,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
     @Override
     public int operationMaterial(Map<String, Object> mapVal) {
         // 得到金蝶物资主键id
-        Integer EASMaterialIdValue = (Integer) mapVal.get("EASMaterialId");
-        BigDecimal EASMaterialId = new BigDecimal(EASMaterialIdValue);
+        String EASMaterialId = (String) mapVal.get("EASMaterialId");
         // 得到物资唯一编码
         String materialCode = (String) mapVal.get("materialCode");
         // 得到物资类型

+ 1 - 2
src/main/java/com/steerinfo/dil/service/impl/RmsSupplierServiceImpl.java

@@ -39,8 +39,7 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
     @Override
     public int operationSupplier(Map<String, Object> mapVal) {
         // 得到金蝶主键供应商id
-        Integer EASSupplierIdValue = (Integer) mapVal.get("EASSupplierId");
-        BigDecimal EASSupplierId = new BigDecimal(EASSupplierIdValue);
+        String EASSupplierId = (String) mapVal.get("EASSupplierId");
         // 得到供应商名称
         String supplierName = (String) mapVal.get("supplierName");
         // 得到供应商供应商简称

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

@@ -18,7 +18,7 @@
         <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-        <result column="EAS_PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="easPurchaseOrderId" />
+        <result column="EAS_PURCHASE_ORDER_ID" jdbcType="VARCHAR" property="easPurchaseOrderId" />
     </resultMap>
     <sql id="columns">
         PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
@@ -33,10 +33,10 @@
     t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_PURCHASE_ORDER_ID
     </sql>
     <sql id="select">
-        SELECT <include refid="columns" /> FROM AMS_PURCHASE_ORDER
+        SELECT <include refid="columns"/> FROM AMS_PURCHASE_ORDER
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM AMS_PURCHASE_ORDER t
+        SELECT <include refid="columns_alias"/> FROM AMS_PURCHASE_ORDER t
     </sql>
     <sql id="where">
         <where>
@@ -88,7 +88,7 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
-            <if test="easPurchaseOrderId != null">
+            <if test="easPurchaseOrderId != null and easPurchaseOrderId != ''">
                 and EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId}
             </if>
         </where>
@@ -143,8 +143,8 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
-            <if test="easPurchaseOrderId != null">
-                and EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId}
+            <if test="easPurchaseOrderId != null and easPurchaseOrderId != ''">
+                and EAS_PURCHASE_ORDER_ID LIKE '%${easPurchaseOrderId}%'
             </if>
         </where>
     </sql>
@@ -200,7 +200,7 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
-        <if test="easPurchaseOrderId != null">
+        <if test="easPurchaseOrderId != null and easPurchaseOrderId != ''">
             or EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId}
         </if>
     </delete>
@@ -219,7 +219,7 @@
                 #{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}, #{easPurchaseOrderId,jdbcType=DECIMAL}
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easPurchaseOrderId,jdbcType=VARCHAR}
                )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -327,7 +327,7 @@
                 #{deleted,jdbcType=DECIMAL},
             </if>
             <if test="easPurchaseOrderId != null">
-                #{easPurchaseOrderId,jdbcType=DECIMAL},
+                #{easPurchaseOrderId,jdbcType=VARCHAR},
             </if>
         </trim>
     </insert>
@@ -348,7 +348,7 @@
             UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             DELETED = #{deleted,jdbcType=DECIMAL},
-            EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=DECIMAL}
+            EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR}
         where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -400,22 +400,22 @@
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
             <if test="easPurchaseOrderId != null">
-                EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=DECIMAL},
+                EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR},
             </if>
         </set>
         where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select" />
+        <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" />
+        <include refid="select"/>
+        <include refid="where"/>
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="whereLike" />
+        <include refid="select"/>
+        <include refid="whereLike"/>
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into AMS_PURCHASE_ORDER
@@ -438,89 +438,89 @@
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-        #{item.easPurchaseOrderId,jdbcType=DECIMAL} from dual
+        #{item.easPurchaseOrderId,jdbcType=VARCHAR} 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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
             when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
         ,EAS_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.easPurchaseOrderId,jdbcType=DECIMAL}
+        <foreach collection="list" item="item" index="index" separator=" " open="case PURCHASE_ORDER_ID" close="end">
+            when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.easPurchaseOrderId,jdbcType=VARCHAR}
         </foreach>
         where PURCHASE_ORDER_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{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=",">
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>

+ 369 - 0
src/main/resources/com/steerinfo/dil/mapper/BmsportHandlingFeeMapper.xml

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

+ 423 - 0
src/main/resources/com/steerinfo/dil/mapper/BmsshipDetailsOrderMapper.xml

@@ -0,0 +1,423 @@
+<?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.BmsshipDetailsOrderMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipDetailsOrder">
+    <id column="DETAILS_ID" jdbcType="DECIMAL" property="detailsId" />
+    <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId" />
+    <result column="DETAILS_NO" jdbcType="VARCHAR" property="detailsNo" />
+    <result column="DETAILS_TIME" jdbcType="TIMESTAMP" property="detailsTime" />
+    <result column="DETAILS_FEE_TYPE" jdbcType="VARCHAR" property="detailsFeeType" />
+    <result column="DETAILS_AMOUNT" jdbcType="DECIMAL" property="detailsAmount" />
+    <result column="WETHER_TO_STATEMENT" jdbcType="DECIMAL" property="wetherToStatement" />
+    <result column="TRUCK_RESULT_TOTAL_ID" jdbcType="DECIMAL" property="truckResultTotalId" />
+    <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">
+    DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
+    WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.DETAILS_ID, t.PURCHASE_ORDER_ID, t.DETAILS_NO, t.DETAILS_TIME, t.DETAILS_FEE_TYPE, 
+    t.DETAILS_AMOUNT, t.WETHER_TO_STATEMENT, t.TRUCK_RESULT_TOTAL_ID, 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 BMSSHIP_DETAILS_ORDER
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM BMSSHIP_DETAILS_ORDER t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="detailsId != null">
+        and DETAILS_ID = #{detailsId}
+      </if>
+      <if test="purchaseOrderId != null">
+        and PURCHASE_ORDER_ID = #{purchaseOrderId}
+      </if>
+      <if test="detailsNo != null and detailsNo != ''">
+        and DETAILS_NO = #{detailsNo}
+      </if>
+      <if test="detailsTime != null">
+        and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+      </if>
+      <if test="detailsFeeType != null and detailsFeeType != ''">
+        and DETAILS_FEE_TYPE = #{detailsFeeType}
+      </if>
+      <if test="detailsAmount != null">
+        and DETAILS_AMOUNT = #{detailsAmount}
+      </if>
+      <if test="wetherToStatement != null">
+        and WETHER_TO_STATEMENT = #{wetherToStatement}
+      </if>
+      <if test="truckResultTotalId != null">
+        and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+      </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="detailsId != null">
+        and DETAILS_ID = #{detailsId}
+      </if>
+      <if test="purchaseOrderId != null">
+        and PURCHASE_ORDER_ID = #{purchaseOrderId}
+      </if>
+      <if test="detailsNo != null and detailsNo != ''">
+        and DETAILS_NO LIKE '%${detailsNo}%'
+      </if>
+      <if test="detailsTime != null">
+        and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+      </if>
+      <if test="detailsFeeType != null and detailsFeeType != ''">
+        and DETAILS_FEE_TYPE LIKE '%${detailsFeeType}%'
+      </if>
+      <if test="detailsAmount != null">
+        and DETAILS_AMOUNT = #{detailsAmount}
+      </if>
+      <if test="wetherToStatement != null">
+        and WETHER_TO_STATEMENT = #{wetherToStatement}
+      </if>
+      <if test="truckResultTotalId != null">
+        and TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+      </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 BMSSHIP_DETAILS_ORDER
+    where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from BMSSHIP_DETAILS_ORDER
+    where 1!=1 
+      <if test="purchaseOrderId != null">
+        or PURCHASE_ORDER_ID = #{purchaseOrderId}
+      </if>
+      <if test="detailsNo != null and detailsNo != ''">
+        or DETAILS_NO = #{detailsNo}
+      </if>
+      <if test="detailsTime != null">
+        or TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = '#{detailsTime}'
+      </if>
+      <if test="detailsFeeType != null and detailsFeeType != ''">
+        or DETAILS_FEE_TYPE = #{detailsFeeType}
+      </if>
+      <if test="detailsAmount != null">
+        or DETAILS_AMOUNT = #{detailsAmount}
+      </if>
+      <if test="wetherToStatement != null">
+        or WETHER_TO_STATEMENT = #{wetherToStatement}
+      </if>
+      <if test="truckResultTotalId != null">
+        or TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId}
+      </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.BmsshipDetailsOrder">
+    insert into BMSSHIP_DETAILS_ORDER (DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, 
+      DETAILS_TIME, DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
+      WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{detailsId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{detailsNo,jdbcType=VARCHAR}, 
+      #{detailsTime,jdbcType=TIMESTAMP}, #{detailsFeeType,jdbcType=VARCHAR}, #{detailsAmount,jdbcType=DECIMAL}, 
+      #{wetherToStatement,jdbcType=DECIMAL}, #{truckResultTotalId,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.BmsshipDetailsOrder">
+    insert into BMSSHIP_DETAILS_ORDER
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="detailsId != null">
+        DETAILS_ID,
+      </if>
+      <if test="purchaseOrderId != null">
+        PURCHASE_ORDER_ID,
+      </if>
+      <if test="detailsNo != null">
+        DETAILS_NO,
+      </if>
+      <if test="detailsTime != null">
+        DETAILS_TIME,
+      </if>
+      <if test="detailsFeeType != null">
+        DETAILS_FEE_TYPE,
+      </if>
+      <if test="detailsAmount != null">
+        DETAILS_AMOUNT,
+      </if>
+      <if test="wetherToStatement != null">
+        WETHER_TO_STATEMENT,
+      </if>
+      <if test="truckResultTotalId != null">
+        TRUCK_RESULT_TOTAL_ID,
+      </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="detailsId != null">
+        #{detailsId,jdbcType=DECIMAL},
+      </if>
+      <if test="purchaseOrderId != null">
+        #{purchaseOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="detailsNo != null">
+        #{detailsNo,jdbcType=VARCHAR},
+      </if>
+      <if test="detailsTime != null">
+        #{detailsTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="detailsFeeType != null">
+        #{detailsFeeType,jdbcType=VARCHAR},
+      </if>
+      <if test="detailsAmount != null">
+        #{detailsAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="wetherToStatement != null">
+        #{wetherToStatement,jdbcType=DECIMAL},
+      </if>
+      <if test="truckResultTotalId != null">
+        #{truckResultTotalId,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.BmsshipDetailsOrder">
+    update BMSSHIP_DETAILS_ORDER
+    set PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
+      DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
+      DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
+      DETAILS_FEE_TYPE = #{detailsFeeType,jdbcType=VARCHAR},
+      DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
+      WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
+      TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,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 DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipDetailsOrder">
+    update BMSSHIP_DETAILS_ORDER
+    <set>
+      <if test="purchaseOrderId != null">
+        PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
+      </if>
+      <if test="detailsNo != null">
+        DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
+      </if>
+      <if test="detailsTime != null">
+        DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="detailsFeeType != null">
+        DETAILS_FEE_TYPE = #{detailsFeeType,jdbcType=VARCHAR},
+      </if>
+      <if test="detailsAmount != null">
+        DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="wetherToStatement != null">
+        WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
+      </if>
+      <if test="truckResultTotalId != null">
+        TRUCK_RESULT_TOTAL_ID = #{truckResultTotalId,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 DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where DETAILS_ID = #{detailsId,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 BMSSHIP_DETAILS_ORDER 
+      (DETAILS_ID, 
+      PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, 
+      DETAILS_FEE_TYPE, DETAILS_AMOUNT, 
+      WETHER_TO_STATEMENT, TRUCK_RESULT_TOTAL_ID, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.detailsId,jdbcType=DECIMAL}, 
+      #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.detailsNo,jdbcType=VARCHAR}, #{item.detailsTime,jdbcType=TIMESTAMP}, 
+      #{item.detailsFeeType,jdbcType=VARCHAR}, #{item.detailsAmount,jdbcType=DECIMAL}, 
+      #{item.wetherToStatement,jdbcType=DECIMAL}, #{item.truckResultTotalId,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 BMSSHIP_DETAILS_ORDER
+     set
+       DETAILS_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsId,jdbcType=DECIMAL}
+       </foreach>
+       ,PURCHASE_ORDER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+       </foreach>
+       ,DETAILS_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsNo,jdbcType=VARCHAR}
+       </foreach>
+       ,DETAILS_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DETAILS_FEE_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsFeeType,jdbcType=VARCHAR}
+       </foreach>
+       ,DETAILS_AMOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,WETHER_TO_STATEMENT=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.wetherToStatement,jdbcType=DECIMAL}
+       </foreach>
+       ,TRUCK_RESULT_TOTAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.truckResultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+          when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where DETAILS_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.detailsId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from BMSSHIP_DETAILS_ORDER
+    where DETAILS_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+  
+</mapper>

+ 374 - 0
src/main/resources/com/steerinfo/dil/mapper/BmsshipStatementMapper.xml

@@ -0,0 +1,374 @@
+<?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.BmsshipStatementMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmsshipStatement">
+    <id column="STATEMENT_ID" jdbcType="DECIMAL" property="statementId" />
+    <result column="STATEMENT_NO" jdbcType="VARCHAR" property="statementNo" />
+    <result column="STATEMENT_SHIPPER_ID" jdbcType="DECIMAL" property="statementShipperId" />
+    <result column="STATEMENT_TOTAL_AMOUNT" jdbcType="DECIMAL" property="statementTotalAmount" />
+    <result column="STATEMENT_DATE" jdbcType="TIMESTAMP" property="statementDate" />
+    <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="STATEMENT_TYPE" jdbcType="VARCHAR" property="statementType" />
+  </resultMap>
+  <sql id="columns">
+    STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    STATEMENT_TYPE
+  </sql>
+  <sql id="columns_alias">
+    t.STATEMENT_ID, t.STATEMENT_NO, t.STATEMENT_SHIPPER_ID, t.STATEMENT_TOTAL_AMOUNT, 
+    t.STATEMENT_DATE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
+    t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM BMSSHIP_STATEMENT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM BMSSHIP_STATEMENT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="statementId != null">
+        and STATEMENT_ID = #{statementId}
+      </if>
+      <if test="statementNo != null and statementNo != ''">
+        and STATEMENT_NO = #{statementNo}
+      </if>
+      <if test="statementShipperId != null">
+        and STATEMENT_SHIPPER_ID = #{statementShipperId}
+      </if>
+      <if test="statementTotalAmount != null">
+        and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+      </if>
+      <if test="statementDate != null">
+        and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+      </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="statementType != null and statementType != ''">
+        and STATEMENT_TYPE = #{statementType}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="statementId != null">
+        and STATEMENT_ID = #{statementId}
+      </if>
+      <if test="statementNo != null and statementNo != ''">
+        and STATEMENT_NO LIKE '%${statementNo}%'
+      </if>
+      <if test="statementShipperId != null">
+        and STATEMENT_SHIPPER_ID = #{statementShipperId}
+      </if>
+      <if test="statementTotalAmount != null">
+        and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+      </if>
+      <if test="statementDate != null">
+        and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+      </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="statementType != null and statementType != ''">
+        and STATEMENT_TYPE LIKE '%${statementType}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from BMSSHIP_STATEMENT
+    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from BMSSHIP_STATEMENT
+    where 1!=1 
+      <if test="statementNo != null and statementNo != ''">
+        or STATEMENT_NO = #{statementNo}
+      </if>
+      <if test="statementShipperId != null">
+        or STATEMENT_SHIPPER_ID = #{statementShipperId}
+      </if>
+      <if test="statementTotalAmount != null">
+        or STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+      </if>
+      <if test="statementDate != null">
+        or TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = '#{statementDate}'
+      </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="statementType != null and statementType != ''">
+        or STATEMENT_TYPE = #{statementType}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+    insert into BMSSHIP_STATEMENT (STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, 
+      STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE
+      )
+    values (#{statementId,jdbcType=DECIMAL}, #{statementNo,jdbcType=VARCHAR}, #{statementShipperId,jdbcType=DECIMAL}, 
+      #{statementTotalAmount,jdbcType=DECIMAL}, #{statementDate,jdbcType=TIMESTAMP}, 
+      #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{statementType,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+    insert into BMSSHIP_STATEMENT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="statementId != null">
+        STATEMENT_ID,
+      </if>
+      <if test="statementNo != null">
+        STATEMENT_NO,
+      </if>
+      <if test="statementShipperId != null">
+        STATEMENT_SHIPPER_ID,
+      </if>
+      <if test="statementTotalAmount != null">
+        STATEMENT_TOTAL_AMOUNT,
+      </if>
+      <if test="statementDate != null">
+        STATEMENT_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="statementType != null">
+        STATEMENT_TYPE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="statementId != null">
+        #{statementId,jdbcType=DECIMAL},
+      </if>
+      <if test="statementNo != null">
+        #{statementNo,jdbcType=VARCHAR},
+      </if>
+      <if test="statementShipperId != null">
+        #{statementShipperId,jdbcType=DECIMAL},
+      </if>
+      <if test="statementTotalAmount != null">
+        #{statementTotalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="statementDate != null">
+        #{statementDate,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="statementType != null">
+        #{statementType,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+    update BMSSHIP_STATEMENT
+    set STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
+      STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
+      STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+      STATEMENT_DATE = #{statementDate,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},
+      STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR}
+    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
+    update BMSSHIP_STATEMENT
+    <set>
+      <if test="statementNo != null">
+        STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
+      </if>
+      <if test="statementShipperId != null">
+        STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
+      </if>
+      <if test="statementTotalAmount != null">
+        STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="statementDate != null">
+        STATEMENT_DATE = #{statementDate,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="statementType != null">
+        STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where STATEMENT_ID = #{statementId,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 BMSSHIP_STATEMENT 
+      (STATEMENT_ID, 
+      STATEMENT_NO, STATEMENT_SHIPPER_ID, 
+      STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, STATEMENT_TYPE
+      )
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.statementId,jdbcType=DECIMAL}, 
+      #{item.statementNo,jdbcType=VARCHAR}, #{item.statementShipperId,jdbcType=DECIMAL}, 
+      #{item.statementTotalAmount,jdbcType=DECIMAL}, #{item.statementDate,jdbcType=TIMESTAMP}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=VARCHAR}
+       from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update BMSSHIP_STATEMENT
+     set
+       STATEMENT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementId,jdbcType=DECIMAL}
+       </foreach>
+       ,STATEMENT_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementNo,jdbcType=VARCHAR}
+       </foreach>
+       ,STATEMENT_SHIPPER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementShipperId,jdbcType=DECIMAL}
+       </foreach>
+       ,STATEMENT_TOTAL_AMOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementTotalAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,STATEMENT_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,STATEMENT_TYPE=
+       <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+          when #{item.statementId,jdbcType=DECIMAL} then #{item.statementType,jdbcType=VARCHAR}
+       </foreach>
+     where STATEMENT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.statementId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from BMSSHIP_STATEMENT
+    where STATEMENT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+</mapper>

+ 491 - 0
src/main/resources/com/steerinfo/dil/mapper/BmstrainDetailsOrderMapper.xml

@@ -0,0 +1,491 @@
+<?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.BmstrainDetailsOrderMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmstrainDetailsOrder">
+        <id column="DETAILS_ID" jdbcType="DECIMAL" property="detailsId"/>
+        <result column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId"/>
+        <result column="DETAILS_NO" jdbcType="VARCHAR" property="detailsNo"/>
+        <result column="DETAILS_TIME" jdbcType="TIMESTAMP" property="detailsTime"/>
+        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId"/>
+        <result column="DETAILS_AMOUNT" jdbcType="DECIMAL" property="detailsAmount"/>
+        <result column="DETAILS_FLOAT_AMOUNT" jdbcType="DECIMAL" property="detailsFloatAmount"/>
+        <result column="DETAILS_MAGIN_AMOUNT" jdbcType="DECIMAL" property="detailsMaginAmount"/>
+        <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="WETHER_TO_STATEMENT" jdbcType="DECIMAL" property="wetherToStatement"/>
+        <result column="TRAIN_LOADING_RESULT_ID" jdbcType="DECIMAL" property="trainLoadingResultId"/>
+    </resultMap>
+    <sql id="columns">
+        DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME, PRICE_ID, DETAILS_AMOUNT,
+    DETAILS_FLOAT_AMOUNT, DETAILS_MAGIN_AMOUNT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, WETHER_TO_STATEMENT, TRAIN_LOADING_RESULT_ID
+    </sql>
+    <sql id="columns_alias">
+        t.DETAILS_ID, t.PURCHASE_ORDER_ID, t.DETAILS_NO, t.DETAILS_TIME, t.PRICE_ID, t.DETAILS_AMOUNT,
+    t.DETAILS_FLOAT_AMOUNT, t.DETAILS_MAGIN_AMOUNT, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.WETHER_TO_STATEMENT, 
+    t.TRAIN_LOADING_RESULT_ID
+    </sql>
+    <sql id="select">
+        SELECT
+        <include refid="columns"/>
+        FROM BMSTRAIN_DETAILS_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM BMSTRAIN_DETAILS_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="detailsId != null">
+                and DETAILS_ID = #{detailsId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="detailsNo != null and detailsNo != ''">
+                and DETAILS_NO = #{detailsNo}
+            </if>
+            <if test="detailsTime != null">
+                and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="detailsAmount != null">
+                and DETAILS_AMOUNT = #{detailsAmount}
+            </if>
+            <if test="detailsFloatAmount != null">
+                and DETAILS_FLOAT_AMOUNT = #{detailsFloatAmount}
+            </if>
+            <if test="detailsMaginAmount != null">
+                and DETAILS_MAGIN_AMOUNT = #{detailsMaginAmount}
+            </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="wetherToStatement != null">
+                and WETHER_TO_STATEMENT = #{wetherToStatement}
+            </if>
+            <if test="trainLoadingResultId != null">
+                and TRAIN_LOADING_RESULT_ID = #{trainLoadingResultId}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="detailsId != null">
+                and DETAILS_ID = #{detailsId}
+            </if>
+            <if test="purchaseOrderId != null">
+                and PURCHASE_ORDER_ID = #{purchaseOrderId}
+            </if>
+            <if test="detailsNo != null and detailsNo != ''">
+                and DETAILS_NO LIKE '%${detailsNo}%'
+            </if>
+            <if test="detailsTime != null">
+                and TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = #{detailsTime}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="detailsAmount != null">
+                and DETAILS_AMOUNT = #{detailsAmount}
+            </if>
+            <if test="detailsFloatAmount != null">
+                and DETAILS_FLOAT_AMOUNT = #{detailsFloatAmount}
+            </if>
+            <if test="detailsMaginAmount != null">
+                and DETAILS_MAGIN_AMOUNT = #{detailsMaginAmount}
+            </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="wetherToStatement != null">
+                and WETHER_TO_STATEMENT = #{wetherToStatement}
+            </if>
+            <if test="trainLoadingResultId != null">
+                and TRAIN_LOADING_RESULT_ID = #{trainLoadingResultId}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+        delete
+        from BMSTRAIN_DETAILS_ORDER
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from BMSTRAIN_DETAILS_ORDER
+        where 1!=1
+        <if test="purchaseOrderId != null">
+            or PURCHASE_ORDER_ID = #{purchaseOrderId}
+        </if>
+        <if test="detailsNo != null and detailsNo != ''">
+            or DETAILS_NO = #{detailsNo}
+        </if>
+        <if test="detailsTime != null">
+            or TO_CHAR(DETAILS_TIME,'yyyy-MM-dd') = '#{detailsTime}'
+        </if>
+        <if test="priceId != null">
+            or PRICE_ID = #{priceId}
+        </if>
+        <if test="detailsAmount != null">
+            or DETAILS_AMOUNT = #{detailsAmount}
+        </if>
+        <if test="detailsFloatAmount != null">
+            or DETAILS_FLOAT_AMOUNT = #{detailsFloatAmount}
+        </if>
+        <if test="detailsMaginAmount != null">
+            or DETAILS_MAGIN_AMOUNT = #{detailsMaginAmount}
+        </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="wetherToStatement != null">
+            or WETHER_TO_STATEMENT = #{wetherToStatement}
+        </if>
+        <if test="trainLoadingResultId != null">
+            or TRAIN_LOADING_RESULT_ID = #{trainLoadingResultId}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.BmstrainDetailsOrder">
+        insert into BMSTRAIN_DETAILS_ORDER (DETAILS_ID, PURCHASE_ORDER_ID, DETAILS_NO,
+                                            DETAILS_TIME, PRICE_ID, DETAILS_AMOUNT,
+                                            DETAILS_FLOAT_AMOUNT, DETAILS_MAGIN_AMOUNT,
+                                            INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                            UPDATE_TIME, INSERT_UPDATE_REMARK, WETHER_TO_STATEMENT,
+                                            TRAIN_LOADING_RESULT_ID)
+        values (#{detailsId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{detailsNo,jdbcType=VARCHAR},
+                #{detailsTime,jdbcType=TIMESTAMP}, #{priceId,jdbcType=DECIMAL}, #{detailsAmount,jdbcType=DECIMAL},
+                #{detailsFloatAmount,jdbcType=DECIMAL}, #{detailsMaginAmount,jdbcType=DECIMAL},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{wetherToStatement,jdbcType=DECIMAL},
+                #{trainLoadingResultId,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmstrainDetailsOrder">
+        insert into BMSTRAIN_DETAILS_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="detailsId != null">
+                DETAILS_ID,
+            </if>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID,
+            </if>
+            <if test="detailsNo != null">
+                DETAILS_NO,
+            </if>
+            <if test="detailsTime != null">
+                DETAILS_TIME,
+            </if>
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="detailsAmount != null">
+                DETAILS_AMOUNT,
+            </if>
+            <if test="detailsFloatAmount != null">
+                DETAILS_FLOAT_AMOUNT,
+            </if>
+            <if test="detailsMaginAmount != null">
+                DETAILS_MAGIN_AMOUNT,
+            </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="wetherToStatement != null">
+                WETHER_TO_STATEMENT,
+            </if>
+            <if test="trainLoadingResultId != null">
+                TRAIN_LOADING_RESULT_ID,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="detailsId != null">
+                #{detailsId,jdbcType=DECIMAL},
+            </if>
+            <if test="purchaseOrderId != null">
+                #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsNo != null">
+                #{detailsNo,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsTime != null">
+                #{detailsTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsAmount != null">
+                #{detailsAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsFloatAmount != null">
+                #{detailsFloatAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsMaginAmount != null">
+                #{detailsMaginAmount,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="wetherToStatement != null">
+                #{wetherToStatement,jdbcType=DECIMAL},
+            </if>
+            <if test="trainLoadingResultId != null">
+                #{trainLoadingResultId,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmstrainDetailsOrder">
+        update BMSTRAIN_DETAILS_ORDER
+        set PURCHASE_ORDER_ID       = #{purchaseOrderId,jdbcType=DECIMAL},
+            DETAILS_NO              = #{detailsNo,jdbcType=VARCHAR},
+            DETAILS_TIME            = #{detailsTime,jdbcType=TIMESTAMP},
+            PRICE_ID                = #{priceId,jdbcType=DECIMAL},
+            DETAILS_AMOUNT          = #{detailsAmount,jdbcType=DECIMAL},
+            DETAILS_FLOAT_AMOUNT    = #{detailsFloatAmount,jdbcType=DECIMAL},
+            DETAILS_MAGIN_AMOUNT    = #{detailsMaginAmount,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},
+            WETHER_TO_STATEMENT     = #{wetherToStatement,jdbcType=DECIMAL},
+            TRAIN_LOADING_RESULT_ID = #{trainLoadingResultId,jdbcType=DECIMAL}
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmstrainDetailsOrder">
+        update BMSTRAIN_DETAILS_ORDER
+        <set>
+            <if test="purchaseOrderId != null">
+                PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsNo != null">
+                DETAILS_NO = #{detailsNo,jdbcType=VARCHAR},
+            </if>
+            <if test="detailsTime != null">
+                DETAILS_TIME = #{detailsTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="priceId != null">
+                PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsAmount != null">
+                DETAILS_AMOUNT = #{detailsAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsFloatAmount != null">
+                DETAILS_FLOAT_AMOUNT = #{detailsFloatAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="detailsMaginAmount != null">
+                DETAILS_MAGIN_AMOUNT = #{detailsMaginAmount,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="wetherToStatement != null">
+                WETHER_TO_STATEMENT = #{wetherToStatement,jdbcType=DECIMAL},
+            </if>
+            <if test="trainLoadingResultId != null">
+                TRAIN_LOADING_RESULT_ID = #{trainLoadingResultId,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where DETAILS_ID = #{detailsId,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 BMSTRAIN_DETAILS_ORDER
+        (DETAILS_ID,
+        PURCHASE_ORDER_ID, DETAILS_NO, DETAILS_TIME,
+        PRICE_ID, DETAILS_AMOUNT, DETAILS_FLOAT_AMOUNT,
+        DETAILS_MAGIN_AMOUNT, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        WETHER_TO_STATEMENT, TRAIN_LOADING_RESULT_ID
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.detailsId,jdbcType=DECIMAL},
+        #{item.purchaseOrderId,jdbcType=DECIMAL}, #{item.detailsNo,jdbcType=VARCHAR},
+        #{item.detailsTime,jdbcType=TIMESTAMP},
+        #{item.priceId,jdbcType=DECIMAL}, #{item.detailsAmount,jdbcType=DECIMAL},
+        #{item.detailsFloatAmount,jdbcType=DECIMAL},
+        #{item.detailsMaginAmount,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.wetherToStatement,jdbcType=DECIMAL}, #{item.trainLoadingResultId,jdbcType=DECIMAL}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update BMSTRAIN_DETAILS_ORDER
+        set
+        DETAILS_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsId,jdbcType=DECIMAL}
+        </foreach>
+        ,PURCHASE_ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+        </foreach>
+        ,DETAILS_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsNo,jdbcType=VARCHAR}
+        </foreach>
+        ,DETAILS_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,DETAILS_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,DETAILS_FLOAT_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsFloatAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,DETAILS_MAGIN_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.detailsMaginAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,WETHER_TO_STATEMENT=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.wetherToStatement,jdbcType=DECIMAL}
+        </foreach>
+        ,TRAIN_LOADING_RESULT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case DETAILS_ID" separator=" ">
+            when #{item.detailsId,jdbcType=DECIMAL} then #{item.trainLoadingResultId,jdbcType=DECIMAL}
+        </foreach>
+        where DETAILS_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.detailsId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from BMSTRAIN_DETAILS_ORDER
+        where DETAILS_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+    <select id="getPurchaseTrainDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BDO.DETAILS_NO   AS "detailsNo",
+               BDO.DETAILS_TIME AS "detailsTime"
+        FROM BMSTRAIN_DETAILS_STATEMENT BDS
+                 LEFT JOIN BMSTRAIN_DETAILS_ORDER BDO
+                           ON BDO.DETAILS_ID = BDS.DETAILS_ID
+    </select>
+
+</mapper>

+ 506 - 0
src/main/resources/com/steerinfo/dil/mapper/BmstrainSettlementMapper.xml

@@ -0,0 +1,506 @@
+<?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.BmstrainSettlementMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmstrainSettlement">
+    <id column="SETTLEMENT_ID" jdbcType="DECIMAL" property="settlementId" />
+    <result column="SETTLEMENT_DATE" jdbcType="TIMESTAMP" property="settlementDate" />
+    <result column="SETTLEMENT_DAY_WAGONS" jdbcType="DECIMAL" property="settlementDayWagons" />
+    <result column="SETTLEMENT_DAY_TONNAGE" jdbcType="DECIMAL" property="settlementDayTonnage" />
+    <result column="SETTLEMENT_DAY_TRANSPORT_COST" jdbcType="DECIMAL" property="settlementDayTransportCost" />
+    <result column="SETTLEMENT_DAY_FLOAT_COST" jdbcType="DECIMAL" property="settlementDayFloatCost" />
+    <result column="SETTLEMENT_DAY_MARGIN" jdbcType="DECIMAL" property="settlementDayMargin" />
+    <result column="SETTLEMENT_MONTH_WAGONS" jdbcType="DECIMAL" property="settlementMonthWagons" />
+    <result column="SETTLEMENT_MONTH_TONNAGE" jdbcType="DECIMAL" property="settlementMonthTonnage" />
+    <result column="SETTLEMENT_MONTH_TOTAL_MONTH" jdbcType="DECIMAL" property="settlementMonthTotalMonth" />
+    <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">
+    SETTLEMENT_ID, SETTLEMENT_DATE, SETTLEMENT_DAY_WAGONS, SETTLEMENT_DAY_TONNAGE, SETTLEMENT_DAY_TRANSPORT_COST, 
+    SETTLEMENT_DAY_FLOAT_COST, SETTLEMENT_DAY_MARGIN, SETTLEMENT_MONTH_WAGONS, SETTLEMENT_MONTH_TONNAGE, 
+    SETTLEMENT_MONTH_TOTAL_MONTH, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+    INSERT_UPDATE_REMARK, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.SETTLEMENT_ID, t.SETTLEMENT_DATE, t.SETTLEMENT_DAY_WAGONS, t.SETTLEMENT_DAY_TONNAGE, 
+    t.SETTLEMENT_DAY_TRANSPORT_COST, t.SETTLEMENT_DAY_FLOAT_COST, t.SETTLEMENT_DAY_MARGIN, 
+    t.SETTLEMENT_MONTH_WAGONS, t.SETTLEMENT_MONTH_TONNAGE, t.SETTLEMENT_MONTH_TOTAL_MONTH, 
+    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 BMSTRAIN_SETTLEMENT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM BMSTRAIN_SETTLEMENT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="settlementId != null">
+        and SETTLEMENT_ID = #{settlementId}
+      </if>
+      <if test="settlementDate != null">
+        and TO_CHAR(SETTLEMENT_DATE,'yyyy-MM-dd') = #{settlementDate}
+      </if>
+      <if test="settlementDayWagons != null">
+        and SETTLEMENT_DAY_WAGONS = #{settlementDayWagons}
+      </if>
+      <if test="settlementDayTonnage != null">
+        and SETTLEMENT_DAY_TONNAGE = #{settlementDayTonnage}
+      </if>
+      <if test="settlementDayTransportCost != null">
+        and SETTLEMENT_DAY_TRANSPORT_COST = #{settlementDayTransportCost}
+      </if>
+      <if test="settlementDayFloatCost != null">
+        and SETTLEMENT_DAY_FLOAT_COST = #{settlementDayFloatCost}
+      </if>
+      <if test="settlementDayMargin != null">
+        and SETTLEMENT_DAY_MARGIN = #{settlementDayMargin}
+      </if>
+      <if test="settlementMonthWagons != null">
+        and SETTLEMENT_MONTH_WAGONS = #{settlementMonthWagons}
+      </if>
+      <if test="settlementMonthTonnage != null">
+        and SETTLEMENT_MONTH_TONNAGE = #{settlementMonthTonnage}
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        and SETTLEMENT_MONTH_TOTAL_MONTH = #{settlementMonthTotalMonth}
+      </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="settlementId != null">
+        and SETTLEMENT_ID = #{settlementId}
+      </if>
+      <if test="settlementDate != null">
+        and TO_CHAR(SETTLEMENT_DATE,'yyyy-MM-dd') = #{settlementDate}
+      </if>
+      <if test="settlementDayWagons != null">
+        and SETTLEMENT_DAY_WAGONS = #{settlementDayWagons}
+      </if>
+      <if test="settlementDayTonnage != null">
+        and SETTLEMENT_DAY_TONNAGE = #{settlementDayTonnage}
+      </if>
+      <if test="settlementDayTransportCost != null">
+        and SETTLEMENT_DAY_TRANSPORT_COST = #{settlementDayTransportCost}
+      </if>
+      <if test="settlementDayFloatCost != null">
+        and SETTLEMENT_DAY_FLOAT_COST = #{settlementDayFloatCost}
+      </if>
+      <if test="settlementDayMargin != null">
+        and SETTLEMENT_DAY_MARGIN = #{settlementDayMargin}
+      </if>
+      <if test="settlementMonthWagons != null">
+        and SETTLEMENT_MONTH_WAGONS = #{settlementMonthWagons}
+      </if>
+      <if test="settlementMonthTonnage != null">
+        and SETTLEMENT_MONTH_TONNAGE = #{settlementMonthTonnage}
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        and SETTLEMENT_MONTH_TOTAL_MONTH = #{settlementMonthTotalMonth}
+      </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 BMSTRAIN_SETTLEMENT
+    where SETTLEMENT_ID = #{settlementId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from BMSTRAIN_SETTLEMENT
+    where 1!=1 
+      <if test="settlementDate != null">
+        or TO_CHAR(SETTLEMENT_DATE,'yyyy-MM-dd') = '#{settlementDate}'
+      </if>
+      <if test="settlementDayWagons != null">
+        or SETTLEMENT_DAY_WAGONS = #{settlementDayWagons}
+      </if>
+      <if test="settlementDayTonnage != null">
+        or SETTLEMENT_DAY_TONNAGE = #{settlementDayTonnage}
+      </if>
+      <if test="settlementDayTransportCost != null">
+        or SETTLEMENT_DAY_TRANSPORT_COST = #{settlementDayTransportCost}
+      </if>
+      <if test="settlementDayFloatCost != null">
+        or SETTLEMENT_DAY_FLOAT_COST = #{settlementDayFloatCost}
+      </if>
+      <if test="settlementDayMargin != null">
+        or SETTLEMENT_DAY_MARGIN = #{settlementDayMargin}
+      </if>
+      <if test="settlementMonthWagons != null">
+        or SETTLEMENT_MONTH_WAGONS = #{settlementMonthWagons}
+      </if>
+      <if test="settlementMonthTonnage != null">
+        or SETTLEMENT_MONTH_TONNAGE = #{settlementMonthTonnage}
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        or SETTLEMENT_MONTH_TOTAL_MONTH = #{settlementMonthTotalMonth}
+      </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.BmstrainSettlement">
+    insert into BMSTRAIN_SETTLEMENT (SETTLEMENT_ID, SETTLEMENT_DATE, SETTLEMENT_DAY_WAGONS, 
+      SETTLEMENT_DAY_TONNAGE, SETTLEMENT_DAY_TRANSPORT_COST, 
+      SETTLEMENT_DAY_FLOAT_COST, SETTLEMENT_DAY_MARGIN, 
+      SETTLEMENT_MONTH_WAGONS, SETTLEMENT_MONTH_TONNAGE, 
+      SETTLEMENT_MONTH_TOTAL_MONTH, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED)
+    values (#{settlementId,jdbcType=DECIMAL}, #{settlementDate,jdbcType=TIMESTAMP}, #{settlementDayWagons,jdbcType=DECIMAL}, 
+      #{settlementDayTonnage,jdbcType=DECIMAL}, #{settlementDayTransportCost,jdbcType=DECIMAL}, 
+      #{settlementDayFloatCost,jdbcType=DECIMAL}, #{settlementDayMargin,jdbcType=DECIMAL}, 
+      #{settlementMonthWagons,jdbcType=DECIMAL}, #{settlementMonthTonnage,jdbcType=DECIMAL}, 
+      #{settlementMonthTotalMonth,jdbcType=DECIMAL}, #{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.BmstrainSettlement">
+    insert into BMSTRAIN_SETTLEMENT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="settlementId != null">
+        SETTLEMENT_ID,
+      </if>
+      <if test="settlementDate != null">
+        SETTLEMENT_DATE,
+      </if>
+      <if test="settlementDayWagons != null">
+        SETTLEMENT_DAY_WAGONS,
+      </if>
+      <if test="settlementDayTonnage != null">
+        SETTLEMENT_DAY_TONNAGE,
+      </if>
+      <if test="settlementDayTransportCost != null">
+        SETTLEMENT_DAY_TRANSPORT_COST,
+      </if>
+      <if test="settlementDayFloatCost != null">
+        SETTLEMENT_DAY_FLOAT_COST,
+      </if>
+      <if test="settlementDayMargin != null">
+        SETTLEMENT_DAY_MARGIN,
+      </if>
+      <if test="settlementMonthWagons != null">
+        SETTLEMENT_MONTH_WAGONS,
+      </if>
+      <if test="settlementMonthTonnage != null">
+        SETTLEMENT_MONTH_TONNAGE,
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        SETTLEMENT_MONTH_TOTAL_MONTH,
+      </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="settlementId != null">
+        #{settlementId,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDate != null">
+        #{settlementDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="settlementDayWagons != null">
+        #{settlementDayWagons,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayTonnage != null">
+        #{settlementDayTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayTransportCost != null">
+        #{settlementDayTransportCost,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayFloatCost != null">
+        #{settlementDayFloatCost,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayMargin != null">
+        #{settlementDayMargin,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthWagons != null">
+        #{settlementMonthWagons,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthTonnage != null">
+        #{settlementMonthTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        #{settlementMonthTotalMonth,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmstrainSettlement">
+    update BMSTRAIN_SETTLEMENT
+    set SETTLEMENT_DATE = #{settlementDate,jdbcType=TIMESTAMP},
+      SETTLEMENT_DAY_WAGONS = #{settlementDayWagons,jdbcType=DECIMAL},
+      SETTLEMENT_DAY_TONNAGE = #{settlementDayTonnage,jdbcType=DECIMAL},
+      SETTLEMENT_DAY_TRANSPORT_COST = #{settlementDayTransportCost,jdbcType=DECIMAL},
+      SETTLEMENT_DAY_FLOAT_COST = #{settlementDayFloatCost,jdbcType=DECIMAL},
+      SETTLEMENT_DAY_MARGIN = #{settlementDayMargin,jdbcType=DECIMAL},
+      SETTLEMENT_MONTH_WAGONS = #{settlementMonthWagons,jdbcType=DECIMAL},
+      SETTLEMENT_MONTH_TONNAGE = #{settlementMonthTonnage,jdbcType=DECIMAL},
+      SETTLEMENT_MONTH_TOTAL_MONTH = #{settlementMonthTotalMonth,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL}
+    where SETTLEMENT_ID = #{settlementId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmstrainSettlement">
+    update BMSTRAIN_SETTLEMENT
+    <set>
+      <if test="settlementDate != null">
+        SETTLEMENT_DATE = #{settlementDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="settlementDayWagons != null">
+        SETTLEMENT_DAY_WAGONS = #{settlementDayWagons,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayTonnage != null">
+        SETTLEMENT_DAY_TONNAGE = #{settlementDayTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayTransportCost != null">
+        SETTLEMENT_DAY_TRANSPORT_COST = #{settlementDayTransportCost,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayFloatCost != null">
+        SETTLEMENT_DAY_FLOAT_COST = #{settlementDayFloatCost,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementDayMargin != null">
+        SETTLEMENT_DAY_MARGIN = #{settlementDayMargin,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthWagons != null">
+        SETTLEMENT_MONTH_WAGONS = #{settlementMonthWagons,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthTonnage != null">
+        SETTLEMENT_MONTH_TONNAGE = #{settlementMonthTonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="settlementMonthTotalMonth != null">
+        SETTLEMENT_MONTH_TOTAL_MONTH = #{settlementMonthTotalMonth,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where SETTLEMENT_ID = #{settlementId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where SETTLEMENT_ID = #{settlementId,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 BMSTRAIN_SETTLEMENT 
+      (SETTLEMENT_ID, 
+      SETTLEMENT_DATE, SETTLEMENT_DAY_WAGONS, 
+      SETTLEMENT_DAY_TONNAGE, SETTLEMENT_DAY_TRANSPORT_COST, 
+      SETTLEMENT_DAY_FLOAT_COST, SETTLEMENT_DAY_MARGIN, 
+      SETTLEMENT_MONTH_WAGONS, SETTLEMENT_MONTH_TONNAGE, 
+      SETTLEMENT_MONTH_TOTAL_MONTH, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.settlementId,jdbcType=DECIMAL}, 
+      #{item.settlementDate,jdbcType=TIMESTAMP}, #{item.settlementDayWagons,jdbcType=DECIMAL}, 
+      #{item.settlementDayTonnage,jdbcType=DECIMAL}, #{item.settlementDayTransportCost,jdbcType=DECIMAL}, 
+      #{item.settlementDayFloatCost,jdbcType=DECIMAL}, #{item.settlementDayMargin,jdbcType=DECIMAL}, 
+      #{item.settlementMonthWagons,jdbcType=DECIMAL}, #{item.settlementMonthTonnage,jdbcType=DECIMAL}, 
+      #{item.settlementMonthTotalMonth,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR}, 
+      #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR}, 
+      #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.deleted,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update BMSTRAIN_SETTLEMENT
+     set
+       SETTLEMENT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementId,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDate,jdbcType=TIMESTAMP}
+       </foreach>
+       ,SETTLEMENT_DAY_WAGONS=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDayWagons,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_DAY_TONNAGE=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDayTonnage,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_DAY_TRANSPORT_COST=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDayTransportCost,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_DAY_FLOAT_COST=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDayFloatCost,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_DAY_MARGIN=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementDayMargin,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_MONTH_WAGONS=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementMonthWagons,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_MONTH_TONNAGE=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementMonthTonnage,jdbcType=DECIMAL}
+       </foreach>
+       ,SETTLEMENT_MONTH_TOTAL_MONTH=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.settlementMonthTotalMonth,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case SETTLEMENT_ID" separator=" ">
+          when #{item.settlementId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where SETTLEMENT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.settlementId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from BMSTRAIN_SETTLEMENT
+    where SETTLEMENT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+  
+  
+</mapper>

+ 375 - 0
src/main/resources/com/steerinfo/dil/mapper/BmstrainStatementMapper.xml

@@ -0,0 +1,375 @@
+<?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.BmstrainStatementMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.BmstrainStatement">
+        <id column="STATEMENT_ID" jdbcType="DECIMAL" property="statementId"/>
+        <result column="STATEMENT_NO" jdbcType="VARCHAR" property="statementNo"/>
+        <result column="STATEMENT_SHIPPER_ID" jdbcType="DECIMAL" property="statementShipperId"/>
+        <result column="STATEMENT_TOTAL_AMOUNT" jdbcType="DECIMAL" property="statementTotalAmount"/>
+        <result column="STATEMENT_DATE" jdbcType="TIMESTAMP" property="statementDate"/>
+        <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">
+        STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID, STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
+    </sql>
+    <sql id="columns_alias">
+        t.STATEMENT_ID, t.STATEMENT_NO, t.STATEMENT_SHIPPER_ID, t.STATEMENT_TOTAL_AMOUNT,
+    t.STATEMENT_DATE, 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 BMSTRAIN_STATEMENT
+    </sql>
+    <sql id="select_alias">
+        SELECT
+        <include refid="columns_alias"/>
+        FROM BMSTRAIN_STATEMENT t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="statementId != null">
+                and STATEMENT_ID = #{statementId}
+            </if>
+            <if test="statementNo != null and statementNo != ''">
+                and STATEMENT_NO = #{statementNo}
+            </if>
+            <if test="statementShipperId != null">
+                and STATEMENT_SHIPPER_ID = #{statementShipperId}
+            </if>
+            <if test="statementTotalAmount != null">
+                and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+            </if>
+            <if test="statementDate != null">
+                and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+            </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="statementId != null">
+                and STATEMENT_ID = #{statementId}
+            </if>
+            <if test="statementNo != null and statementNo != ''">
+                and STATEMENT_NO LIKE '%${statementNo}%'
+            </if>
+            <if test="statementShipperId != null">
+                and STATEMENT_SHIPPER_ID = #{statementShipperId}
+            </if>
+            <if test="statementTotalAmount != null">
+                and STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+            </if>
+            <if test="statementDate != null">
+                and TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = #{statementDate}
+            </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 BMSTRAIN_STATEMENT
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from BMSTRAIN_STATEMENT
+        where 1!=1
+        <if test="statementNo != null and statementNo != ''">
+            or STATEMENT_NO = #{statementNo}
+        </if>
+        <if test="statementShipperId != null">
+            or STATEMENT_SHIPPER_ID = #{statementShipperId}
+        </if>
+        <if test="statementTotalAmount != null">
+            or STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount}
+        </if>
+        <if test="statementDate != null">
+            or TO_CHAR(STATEMENT_DATE,'yyyy-MM-dd') = '#{statementDate}'
+        </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.BmstrainStatement">
+        insert into BMSTRAIN_STATEMENT (STATEMENT_ID, STATEMENT_NO, STATEMENT_SHIPPER_ID,
+                                        STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
+                                        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+                                        UPDATE_TIME, INSERT_UPDATE_REMARK)
+        values (#{statementId,jdbcType=DECIMAL}, #{statementNo,jdbcType=VARCHAR},
+                #{statementShipperId,jdbcType=DECIMAL},
+                #{statementTotalAmount,jdbcType=DECIMAL}, #{statementDate,jdbcType=TIMESTAMP},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmstrainStatement">
+        insert into BMSTRAIN_STATEMENT
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="statementId != null">
+                STATEMENT_ID,
+            </if>
+            <if test="statementNo != null">
+                STATEMENT_NO,
+            </if>
+            <if test="statementShipperId != null">
+                STATEMENT_SHIPPER_ID,
+            </if>
+            <if test="statementTotalAmount != null">
+                STATEMENT_TOTAL_AMOUNT,
+            </if>
+            <if test="statementDate != null">
+                STATEMENT_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>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="statementId != null">
+                #{statementId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementNo != null">
+                #{statementNo,jdbcType=VARCHAR},
+            </if>
+            <if test="statementShipperId != null">
+                #{statementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementTotalAmount != null">
+                #{statementTotalAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="statementDate != null">
+                #{statementDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmstrainStatement">
+        update BMSTRAIN_STATEMENT
+        set STATEMENT_NO           = #{statementNo,jdbcType=VARCHAR},
+            STATEMENT_SHIPPER_ID   = #{statementShipperId,jdbcType=DECIMAL},
+            STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+            STATEMENT_DATE         = #{statementDate,jdbcType=TIMESTAMP},
+            INSERT_USERNAME        = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME            = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR}
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmstrainStatement">
+        update BMSTRAIN_STATEMENT
+        <set>
+            <if test="statementNo != null">
+                STATEMENT_NO = #{statementNo,jdbcType=VARCHAR},
+            </if>
+            <if test="statementShipperId != null">
+                STATEMENT_SHIPPER_ID = #{statementShipperId,jdbcType=DECIMAL},
+            </if>
+            <if test="statementTotalAmount != null">
+                STATEMENT_TOTAL_AMOUNT = #{statementTotalAmount,jdbcType=DECIMAL},
+            </if>
+            <if test="statementDate != null">
+                STATEMENT_DATE = #{statementDate,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUsername != null">
+                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="insertTime != null">
+                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateUsername != null">
+                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null">
+                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+        <include refid="select"/>
+        where STATEMENT_ID = #{statementId,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 BMSTRAIN_STATEMENT
+        (STATEMENT_ID,
+        STATEMENT_NO, STATEMENT_SHIPPER_ID,
+        STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
+        INSERT_USERNAME, INSERT_TIME,
+        UPDATE_USERNAME, UPDATE_TIME,
+        INSERT_UPDATE_REMARK)
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.statementId,jdbcType=DECIMAL},
+        #{item.statementNo,jdbcType=VARCHAR}, #{item.statementShipperId,jdbcType=DECIMAL},
+        #{item.statementTotalAmount,jdbcType=DECIMAL}, #{item.statementDate,jdbcType=TIMESTAMP},
+        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update BMSTRAIN_STATEMENT
+        set
+        STATEMENT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementId,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_NO=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementNo,jdbcType=VARCHAR}
+        </foreach>
+        ,STATEMENT_SHIPPER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementShipperId,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_TOTAL_AMOUNT=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementTotalAmount,jdbcType=DECIMAL}
+        </foreach>
+        ,STATEMENT_DATE=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.statementDate,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        where STATEMENT_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.statementId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from BMSTRAIN_STATEMENT
+        where STATEMENT_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示!!!-->
+    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+    <select id="getTrainStatement" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BS.STATEMENT_NO           AS "statementNo",
+               BS.STATEMENT_DATE         AS "statementDate",
+               RS.SHIPPER_NAME           AS "statementPaymentUnit",
+               RS.SHIPPER_NAME           AS "consigneeCompanyName",
+               BS.STATEMENT_TOTAL_AMOUNT AS "statementTotalAmount"
+        FROM BMSTRAIN_STATEMENT BS
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
+
+    </select>
+
+    <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        FROM BMSTRAIN_DETAILS_STATEMENT BDS
+                 LEFT JOIN BMSTRAIN_DETAILS_ORDER BDO
+                           ON BDS.DETAILS_ID = BDO.DETAILS_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        WHERE BDS.STATEMENT_ID = #{statementId}
+    </select>
+
+</mapper>

+ 67 - 19
src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -426,25 +426,27 @@
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
-    <!-- 查询计费详单 -->
-    <select id="getDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BDO.DETAILS_NO             AS "detailsNo",
-               BDO.DETAILS_TIME           AS "detailsTime",
-               RCA.CAPACITY_NUMBER        AS "capacityNumber",
-               RS.SHIPPER_NAME            AS "shipperName",
-               RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
-               ASP.PLAN_MATERIAL_NUMBER   AS "planMaterialNumber",
-               ACTP.PRICE_VALUE           AS "priceValue",
-               BDO.DETAILS_AMOUNT         AS "detailsAmount",
-               RC.CARRIER_NAME            AS "carrierName",
-               RM.MATERIAL_NAME           AS "materialName",
-               RM.MATERIAL_SPECIFICATION  AS "materialSpecification",
-               RM.MATERIAL_MODEL          AS "materialModel"
-        FROM BMSTRUCK_DETAILS_ORDER BDO
+    <!-- 查询销售计费详单 -->
+    <select id="getSaleDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT DISTINCT BDO.DETAILS_NO             AS "detailsNo",
+                        BDO.DETAILS_TIME           AS "detailsTime",
+                        RCA.CAPACITY_NUMBER        AS "capacityNumber",
+                        RS.SHIPPER_NAME            AS "shipperName",
+                        RCO.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+                        ASP.PLAN_MATERIAL_NUMBER   AS "materialNumber",
+                        BDO.DETAILS_AMOUNT         AS "detailsAmount",
+                        RC.CARRIER_NAME            AS "carrierName",
+                        RM.MATERIAL_NAME           AS "materialName",
+                        RM.MATERIAL_CODE           AS "materialCode"
+        FROM BMSTRUCK_DETAILS_STATEMENT BDS
+                 LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+                           ON BDO.DETAILS_ID = BDS.DETAILS_ID
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON BDO.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
                  LEFT JOIN RMS_CAPACITY RCA
-                           ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+                           ON RCA.CAPACITY_ID = RDC.CAPACITY_ID
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
                  LEFT JOIN AMS_SALE_ORDER ASO
@@ -455,14 +457,60 @@
                            ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
                  LEFT JOIN AMS_SALE_PLAN ASP
                            ON ASP.PLAN_ID = ASO.PLAN_ID
-                 LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
-                           ON ACTP.PRICE_ID = BDO.PRICE_ID
                  LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN RMS_CARRIER RC
                            ON RC.CARRIER_ID = ADSO.CARRIER_ID
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = ASP.MATERIAL_ID
-        WHERE BDO.DETAILS_ID = #{detailsId}
+        WHERE BDS.STATEMENT_ID = #{statementId}
+    </select>
+
+    <!-- 查询采购计费详单 -->
+    <select id="getPurchaseDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT BDO.DETAILS_NO                    AS "detailsNo",
+               BDO.DETAILS_TIME                  AS "detailsTime",
+               RCP.CAPACITY_NUMBER               AS "capacityNumber",
+               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
+               BDO.DETAILS_AMOUNT                AS "detailsAmount",
+               RCR.CARRIER_NAME                  AS "carrierName",
+               RM.MATERIAL_CODE                  AS "materialCode",
+               RM.MATERIAL_NAME                  AS "materialName"
+        FROM BMSTRUCK_DETAILS_ORDER BDO
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_ID = BDO.ORDER_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RCP
+                           ON RCP.CAPACITY_ID = RDC.CAPACITY_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON BDO.PURCHASE_ORDER_ID = APO.PURCHASE_ORDER_ID
+                 LEFT JOIN AMSTRUCK_PURPLAN AP
+                           ON AP.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_CARRIER RCR
+                           ON RCR.CARRIER_ID = AP.CARRIER_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.BATCH_ID = AP.BATCH_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = DB.MATERIAL_ID
+    </select>
+
+    <!-- 查询采购汽运账单所需信息 -->
+    <select id="getStatementMessage" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RS.SHIPPER_NAME             AS "consigneeCompanyName",
+               RCR.CARRIER_NAME            AS "collectionName",
+               RS.SHIPPER_NAME             AS "statementPaymentUnit",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        FROM BMSTRUCK_DETAILS_ORDER BDO
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                 LEFT JOIN AMSTRUCK_PURPLAN AP
+                           ON AP.BATCH_ID = APO.BATCH_ID
+                 LEFT JOIN RMS_CARRIER RCR
+                           ON RCR.CARRIER_ID = AP.CARRIER_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
     </select>
 </mapper>

+ 1 - 1
src/main/resources/com/steerinfo/dil/mapper/BmstruckStatementMapper.xml

@@ -469,7 +469,7 @@
     <!-- 得到收款单位和收货单位 -->
     <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
-               RCA.CARRIER_NAME          AS "carrierName"
+               RCA.CARRIER_NAME          AS "collectionName"
         FROM BMSTRUCK_STATEMENT BS
                  LEFT JOIN BMSTRUCK_DETAILS_STATEMENT BDS
                            ON BS.STATEMENT_ID = BDS.STATEMENT_ID

+ 548 - 551
src/main/resources/com/steerinfo/dil/mapper/RmsConsigneeMapper.xml

@@ -1,563 +1,560 @@
 <?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.RmsConsigneeMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsConsignee">
-        <id column="CONSIGNEE_ID" jdbcType="DECIMAL" property="consigneeId"/>
-        <result column="CONSIGNEE_COMPANY_NAME" jdbcType="VARCHAR" property="consigneeCompanyName"/>
-        <result column="CONSIGNEE_ABBREVIATION" jdbcType="VARCHAR" property="consigneeAbbreviation"/>
-        <result column="CONSIGNEE_REGISTERED_ADDRESS" jdbcType="VARCHAR" property="consigneeRegisteredAddress"/>
-        <result column="CONSIGNEE_RECEIVE_ADDRESS" jdbcType="VARCHAR" property="consigneeReceiveAddress"/>
-        <result column="CONSIGNEE_REGISTRATION_TIME" jdbcType="TIMESTAMP" property="consigneeRegistrationTime"/>
-        <result column="CONSIGNEE_CONTACT_NAME" jdbcType="VARCHAR" property="consigneeContactName"/>
-        <result column="CONSIGNEE_WARRANTY_AMOUNT" jdbcType="DECIMAL" property="consigneeWarrantyAmount"/>
-        <result column="CONSIGNEE_WARRANTY_WEIGHT" jdbcType="VARCHAR" property="consigneeWarrantyWeight"/>
-        <result column="CONSIGNEE_CONTACT_TEL" jdbcType="CHAR" property="consigneeContactTel"/>
-        <result column="CONSIGNEE_EXCHANGE_DELIVERY" jdbcType="DECIMAL" property="consigneeExchangeDelivery"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
-        <result column="EAS_CONSIGNEE_ID" jdbcType="DECIMAL" property="easConsigneeId"/>
-    </resultMap>
-    <sql id="columns">
-        CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS,
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsConsignee">
+    <id column="CONSIGNEE_ID" jdbcType="DECIMAL" property="consigneeId" />
+    <result column="CONSIGNEE_COMPANY_NAME" jdbcType="VARCHAR" property="consigneeCompanyName" />
+    <result column="CONSIGNEE_ABBREVIATION" jdbcType="VARCHAR" property="consigneeAbbreviation" />
+    <result column="CONSIGNEE_REGISTERED_ADDRESS" jdbcType="VARCHAR" property="consigneeRegisteredAddress" />
+    <result column="CONSIGNEE_RECEIVE_ADDRESS" jdbcType="VARCHAR" property="consigneeReceiveAddress" />
+    <result column="CONSIGNEE_REGISTRATION_TIME" jdbcType="TIMESTAMP" property="consigneeRegistrationTime" />
+    <result column="CONSIGNEE_CONTACT_NAME" jdbcType="VARCHAR" property="consigneeContactName" />
+    <result column="CONSIGNEE_WARRANTY_AMOUNT" jdbcType="DECIMAL" property="consigneeWarrantyAmount" />
+    <result column="CONSIGNEE_WARRANTY_WEIGHT" jdbcType="VARCHAR" property="consigneeWarrantyWeight" />
+    <result column="CONSIGNEE_CONTACT_TEL" jdbcType="CHAR" property="consigneeContactTel" />
+    <result column="CONSIGNEE_EXCHANGE_DELIVERY" jdbcType="DECIMAL" property="consigneeExchangeDelivery" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="EAS_CONSIGNEE_ID" jdbcType="VARCHAR" property="easConsigneeId" />
+  </resultMap>
+  <sql id="columns">
+    CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
     CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
     CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID
-    </sql>
-    <sql id="columns_alias">
-        t.CONSIGNEE_ID, t.CONSIGNEE_COMPANY_NAME, t.CONSIGNEE_ABBREVIATION, t.CONSIGNEE_REGISTERED_ADDRESS,
+  </sql>
+  <sql id="columns_alias">
+    t.CONSIGNEE_ID, t.CONSIGNEE_COMPANY_NAME, t.CONSIGNEE_ABBREVIATION, t.CONSIGNEE_REGISTERED_ADDRESS, 
     t.CONSIGNEE_RECEIVE_ADDRESS, t.CONSIGNEE_REGISTRATION_TIME, t.CONSIGNEE_CONTACT_NAME, 
     t.CONSIGNEE_WARRANTY_AMOUNT, t.CONSIGNEE_WARRANTY_WEIGHT, t.CONSIGNEE_CONTACT_TEL, 
     t.CONSIGNEE_EXCHANGE_DELIVERY, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
     t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_CONSIGNEE_ID
-    </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM RMS_CONSIGNEE
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM RMS_CONSIGNEE t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="consigneeId != null">
-                and CONSIGNEE_ID = #{consigneeId}
-            </if>
-            <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-                and CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
-            </if>
-            <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-                and CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
-            </if>
-            <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-                and CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
-            </if>
-            <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-                and CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
-            </if>
-            <if test="consigneeRegistrationTime != null">
-                and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
-            </if>
-            <if test="consigneeContactName != null and consigneeContactName != ''">
-                and CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
-            </if>
-            <if test="consigneeWarrantyAmount != null">
-                and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-            </if>
-            <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-                and CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
-            </if>
-            <if test="consigneeContactTel != null">
-                and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-            </if>
-            <if test="consigneeExchangeDelivery != null">
-                and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-            </if>
-            <if test="insertUsername != null and insertUsername != ''">
-                and INSERT_USERNAME = #{insertUsername}
-            </if>
-            <if test="insertTime != null">
-                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-            </if>
-            <if test="updateUsername != null and updateUsername != ''">
-                and UPDATE_USERNAME = #{updateUsername}
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-            <if test="easConsigneeId != null">
-                and EAS_CONSIGNEE_ID = #{easConsigneeId}
-            </if>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="consigneeId != null">
-                and CONSIGNEE_ID = #{consigneeId}
-            </if>
-            <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-                and CONSIGNEE_COMPANY_NAME LIKE '%${consigneeCompanyName}%'
-            </if>
-            <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-                and CONSIGNEE_ABBREVIATION LIKE '%${consigneeAbbreviation}%'
-            </if>
-            <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-                and CONSIGNEE_REGISTERED_ADDRESS LIKE '%${consigneeRegisteredAddress}%'
-            </if>
-            <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-                and CONSIGNEE_RECEIVE_ADDRESS LIKE '%${consigneeReceiveAddress}%'
-            </if>
-            <if test="consigneeRegistrationTime != null">
-                and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
-            </if>
-            <if test="consigneeContactName != null and consigneeContactName != ''">
-                and CONSIGNEE_CONTACT_NAME LIKE '%${consigneeContactName}%'
-            </if>
-            <if test="consigneeWarrantyAmount != null">
-                and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-            </if>
-            <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-                and CONSIGNEE_WARRANTY_WEIGHT LIKE '%${consigneeWarrantyWeight}%'
-            </if>
-            <if test="consigneeContactTel != null">
-                and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-            </if>
-            <if test="consigneeExchangeDelivery != null">
-                and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-            </if>
-            <if test="insertUsername != null and insertUsername != ''">
-                and INSERT_USERNAME LIKE '%${insertUsername}%'
-            </if>
-            <if test="insertTime != null">
-                and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
-            </if>
-            <if test="updateUsername != null and updateUsername != ''">
-                and UPDATE_USERNAME LIKE '%${updateUsername}%'
-            </if>
-            <if test="updateTime != null">
-                and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
-            </if>
-            <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
-            </if>
-            <if test="deleted != null">
-                and DELETED = #{deleted}
-            </if>
-            <if test="easConsigneeId != null">
-                and EAS_CONSIGNEE_ID = #{easConsigneeId}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete
-        from RMS_CONSIGNEE
-        where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from RMS_CONSIGNEE
-        where 1!=1
-        <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-            or CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
-        </if>
-        <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-            or CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
-        </if>
-        <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-            or CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
-        </if>
-        <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-            or CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
-        </if>
-        <if test="consigneeRegistrationTime != null">
-            or TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = '#{consigneeRegistrationTime}'
-        </if>
-        <if test="consigneeContactName != null and consigneeContactName != ''">
-            or CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
-        </if>
-        <if test="consigneeWarrantyAmount != null">
-            or CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-        </if>
-        <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-            or CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
-        </if>
-        <if test="consigneeContactTel != null">
-            or CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-        </if>
-        <if test="consigneeExchangeDelivery != null">
-            or CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-        </if>
-        <if test="insertUsername != null and insertUsername != ''">
-            or INSERT_USERNAME = #{insertUsername}
-        </if>
-        <if test="insertTime != null">
-            or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-        </if>
-        <if test="updateUsername != null and updateUsername != ''">
-            or UPDATE_USERNAME = #{updateUsername}
-        </if>
-        <if test="updateTime != null">
-            or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-        </if>
-        <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-        </if>
-        <if test="deleted != null">
-            or DELETED = #{deleted}
-        </if>
-        <if test="easConsigneeId != null">
-            or EAS_CONSIGNEE_ID = #{easConsigneeId}
-        </if>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.RmsConsignee">
-        insert into RMS_CONSIGNEE (CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME,
-                                   CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS,
-                                   CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME,
-                                   CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT,
-                                   CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL,
-                                   CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME,
-                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                   INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID)
-        values (#{consigneeId,jdbcType=DECIMAL}, #{consigneeCompanyName,jdbcType=VARCHAR},
-                #{consigneeAbbreviation,jdbcType=VARCHAR}, #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-                #{consigneeReceiveAddress,jdbcType=VARCHAR}, #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-                #{consigneeContactName,jdbcType=VARCHAR}, #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-                #{consigneeWarrantyWeight,jdbcType=VARCHAR}, #{consigneeContactTel,jdbcType=CHAR},
-                #{consigneeExchangeDelivery,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easConsigneeId,jdbcType=DECIMAL})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
-        insert into RMS_CONSIGNEE
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="consigneeId != null">
-                CONSIGNEE_ID,
-            </if>
-            <if test="consigneeCompanyName != null">
-                CONSIGNEE_COMPANY_NAME,
-            </if>
-            <if test="consigneeAbbreviation != null">
-                CONSIGNEE_ABBREVIATION,
-            </if>
-            <if test="consigneeRegisteredAddress != null">
-                CONSIGNEE_REGISTERED_ADDRESS,
-            </if>
-            <if test="consigneeReceiveAddress != null">
-                CONSIGNEE_RECEIVE_ADDRESS,
-            </if>
-            <if test="consigneeRegistrationTime != null">
-                CONSIGNEE_REGISTRATION_TIME,
-            </if>
-            <if test="consigneeContactName != null">
-                CONSIGNEE_CONTACT_NAME,
-            </if>
-            <if test="consigneeWarrantyAmount != null">
-                CONSIGNEE_WARRANTY_AMOUNT,
-            </if>
-            <if test="consigneeWarrantyWeight != null">
-                CONSIGNEE_WARRANTY_WEIGHT,
-            </if>
-            <if test="consigneeContactTel != null">
-                CONSIGNEE_CONTACT_TEL,
-            </if>
-            <if test="consigneeExchangeDelivery != null">
-                CONSIGNEE_EXCHANGE_DELIVERY,
-            </if>
-            <if test="insertUsername != null">
-                INSERT_USERNAME,
-            </if>
-            <if test="insertTime != null">
-                INSERT_TIME,
-            </if>
-            <if test="updateUsername != null">
-                UPDATE_USERNAME,
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME,
-            </if>
-            <if test="insertUpdateRemark != null">
-                INSERT_UPDATE_REMARK,
-            </if>
-            <if test="deleted != null">
-                DELETED,
-            </if>
-            <if test="easConsigneeId != null">
-                EAS_CONSIGNEE_ID,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="consigneeId != null">
-                #{consigneeId,jdbcType=DECIMAL},
-            </if>
-            <if test="consigneeCompanyName != null">
-                #{consigneeCompanyName,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeAbbreviation != null">
-                #{consigneeAbbreviation,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeRegisteredAddress != null">
-                #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeReceiveAddress != null">
-                #{consigneeReceiveAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeRegistrationTime != null">
-                #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="consigneeContactName != null">
-                #{consigneeContactName,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeWarrantyAmount != null">
-                #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-            </if>
-            <if test="consigneeWarrantyWeight != null">
-                #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeContactTel != null">
-                #{consigneeContactTel,jdbcType=CHAR},
-            </if>
-            <if test="consigneeExchangeDelivery != null">
-                #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-            </if>
-            <if test="insertUsername != null">
-                #{insertUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="insertTime != null">
-                #{insertTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUsername != null">
-                #{updateUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="insertUpdateRemark != null">
-                #{insertUpdateRemark,jdbcType=VARCHAR},
-            </if>
-            <if test="deleted != null">
-                #{deleted,jdbcType=DECIMAL},
-            </if>
-            <if test="easConsigneeId != null">
-                #{easConsigneeId,jdbcType=DECIMAL},
-            </if>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsConsignee">
-        update RMS_CONSIGNEE
-        set CONSIGNEE_COMPANY_NAME       = #{consigneeCompanyName,jdbcType=VARCHAR},
-            CONSIGNEE_ABBREVIATION       = #{consigneeAbbreviation,jdbcType=VARCHAR},
-            CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-            CONSIGNEE_RECEIVE_ADDRESS    = #{consigneeReceiveAddress,jdbcType=VARCHAR},
-            CONSIGNEE_REGISTRATION_TIME  = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-            CONSIGNEE_CONTACT_NAME       = #{consigneeContactName,jdbcType=VARCHAR},
-            CONSIGNEE_WARRANTY_AMOUNT    = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-            CONSIGNEE_WARRANTY_WEIGHT    = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-            CONSIGNEE_CONTACT_TEL        = #{consigneeContactTel,jdbcType=CHAR},
-            CONSIGNEE_EXCHANGE_DELIVERY  = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-            INSERT_USERNAME              = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME                  = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME              = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME                  = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK         = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED                      = #{deleted,jdbcType=DECIMAL},
-            EAS_CONSIGNEE_ID             = #{easConsigneeId,jdbcType=DECIMAL}
-        where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
-        update RMS_CONSIGNEE
-        <set>
-            <if test="consigneeCompanyName != null">
-                CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeAbbreviation != null">
-                CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeRegisteredAddress != null">
-                CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeReceiveAddress != null">
-                CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeRegistrationTime != null">
-                CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="consigneeContactName != null">
-                CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeWarrantyAmount != null">
-                CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-            </if>
-            <if test="consigneeWarrantyWeight != null">
-                CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-            </if>
-            <if test="consigneeContactTel != null">
-                CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=CHAR},
-            </if>
-            <if test="consigneeExchangeDelivery != null">
-                CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-            </if>
-            <if test="insertUsername != null">
-                INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="insertTime != null">
-                INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="updateUsername != null">
-                UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-            </if>
-            <if test="updateTime != null">
-                UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="insertUpdateRemark != null">
-                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-            </if>
-            <if test="deleted != null">
-                DELETED = #{deleted,jdbcType=DECIMAL},
-            </if>
-            <if test="easConsigneeId != null">
-                EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where CONSIGNEE_ID = #{consigneeId,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_CONSIGNEE
-        (CONSIGNEE_ID,
-        CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION,
-        CONSIGNEE_REGISTERED_ADDRESS, CONSIGNEE_RECEIVE_ADDRESS,
-        CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME,
-        CONSIGNEE_WARRANTY_AMOUNT, CONSIGNEE_WARRANTY_WEIGHT,
-        CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED,
-        EAS_CONSIGNEE_ID)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.consigneeId,jdbcType=DECIMAL},
-        #{item.consigneeCompanyName,jdbcType=VARCHAR}, #{item.consigneeAbbreviation,jdbcType=VARCHAR},
-        #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}, #{item.consigneeReceiveAddress,jdbcType=VARCHAR},
-        #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}, #{item.consigneeContactName,jdbcType=VARCHAR},
-        #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}, #{item.consigneeWarrantyWeight,jdbcType=VARCHAR},
-        #{item.consigneeContactTel,jdbcType=CHAR}, #{item.consigneeExchangeDelivery,jdbcType=DECIMAL},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
-        #{item.easConsigneeId,jdbcType=DECIMAL} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update RMS_CONSIGNEE
-        set
-        CONSIGNEE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
-        </foreach>
-        ,CONSIGNEE_COMPANY_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCompanyName,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_ABBREVIATION=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeAbbreviation,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_REGISTERED_ADDRESS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_RECEIVE_ADDRESS=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeReceiveAddress,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_REGISTRATION_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,CONSIGNEE_CONTACT_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactName,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_WARRANTY_AMOUNT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}
-        </foreach>
-        ,CONSIGNEE_WARRANTY_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}
-        </foreach>
-        ,CONSIGNEE_CONTACT_TEL=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactTel,jdbcType=CHAR}
-        </foreach>
-        ,CONSIGNEE_EXCHANGE_DELIVERY=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-        </foreach>
-        ,EAS_CONSIGNEE_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case CONSIGNEE_ID" close="end">
-            when #{item.consigneeId,jdbcType=DECIMAL} then #{item.easConsigneeId,jdbcType=DECIMAL}
-        </foreach>
-        where CONSIGNEE_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.consigneeId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from RMS_CONSIGNEE
-        where CONSIGNEE_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
-            #{id}
-        </foreach>
-    </delete>
-    <!-- 友情提示!!!-->
-    <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
-
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_CONSIGNEE
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_CONSIGNEE t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="consigneeId != null">
+        and CONSIGNEE_ID = #{consigneeId}
+      </if>
+      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
+        and CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
+      </if>
+      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
+        and CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
+      </if>
+      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
+        and CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
+      </if>
+      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
+        and CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
+      </if>
+      <if test="consigneeContactName != null and consigneeContactName != ''">
+        and CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
+      </if>
+      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
+        and CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
+      </if>
+      <if test="consigneeContactTel != null">
+        and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="easConsigneeId != null and easConsigneeId != ''">
+        and EAS_CONSIGNEE_ID = #{easConsigneeId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="consigneeId != null">
+        and CONSIGNEE_ID = #{consigneeId}
+      </if>
+      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
+        and CONSIGNEE_COMPANY_NAME LIKE '%${consigneeCompanyName}%'
+      </if>
+      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
+        and CONSIGNEE_ABBREVIATION LIKE '%${consigneeAbbreviation}%'
+      </if>
+      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
+        and CONSIGNEE_REGISTERED_ADDRESS LIKE '%${consigneeRegisteredAddress}%'
+      </if>
+      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
+        and CONSIGNEE_RECEIVE_ADDRESS LIKE '%${consigneeReceiveAddress}%'
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        and TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = #{consigneeRegistrationTime}
+      </if>
+      <if test="consigneeContactName != null and consigneeContactName != ''">
+        and CONSIGNEE_CONTACT_NAME LIKE '%${consigneeContactName}%'
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        and CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
+      </if>
+      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
+        and CONSIGNEE_WARRANTY_WEIGHT LIKE '%${consigneeWarrantyWeight}%'
+      </if>
+      <if test="consigneeContactTel != null">
+        and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="easConsigneeId != null and easConsigneeId != ''">
+        and EAS_CONSIGNEE_ID LIKE '%${easConsigneeId}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from RMS_CONSIGNEE
+    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_CONSIGNEE
+    where 1!=1 
+      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
+        or CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
+      </if>
+      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
+        or CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
+      </if>
+      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
+        or CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
+      </if>
+      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
+        or CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        or TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = '#{consigneeRegistrationTime}'
+      </if>
+      <if test="consigneeContactName != null and consigneeContactName != ''">
+        or CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        or CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
+      </if>
+      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
+        or CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
+      </if>
+      <if test="consigneeContactTel != null">
+        or CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        or CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="easConsigneeId != null and easConsigneeId != ''">
+        or EAS_CONSIGNEE_ID = #{easConsigneeId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsConsignee">
+    insert into RMS_CONSIGNEE (CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, 
+      CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
+      CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, 
+      CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
+      CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, 
+      CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID
+      )
+    values (#{consigneeId,jdbcType=DECIMAL}, #{consigneeCompanyName,jdbcType=VARCHAR}, 
+      #{consigneeAbbreviation,jdbcType=VARCHAR}, #{consigneeRegisteredAddress,jdbcType=VARCHAR}, 
+      #{consigneeReceiveAddress,jdbcType=VARCHAR}, #{consigneeRegistrationTime,jdbcType=TIMESTAMP}, 
+      #{consigneeContactName,jdbcType=VARCHAR}, #{consigneeWarrantyAmount,jdbcType=DECIMAL}, 
+      #{consigneeWarrantyWeight,jdbcType=VARCHAR}, #{consigneeContactTel,jdbcType=CHAR}, 
+      #{consigneeExchangeDelivery,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easConsigneeId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
+    insert into RMS_CONSIGNEE
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="consigneeId != null">
+        CONSIGNEE_ID,
+      </if>
+      <if test="consigneeCompanyName != null">
+        CONSIGNEE_COMPANY_NAME,
+      </if>
+      <if test="consigneeAbbreviation != null">
+        CONSIGNEE_ABBREVIATION,
+      </if>
+      <if test="consigneeRegisteredAddress != null">
+        CONSIGNEE_REGISTERED_ADDRESS,
+      </if>
+      <if test="consigneeReceiveAddress != null">
+        CONSIGNEE_RECEIVE_ADDRESS,
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        CONSIGNEE_REGISTRATION_TIME,
+      </if>
+      <if test="consigneeContactName != null">
+        CONSIGNEE_CONTACT_NAME,
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        CONSIGNEE_WARRANTY_AMOUNT,
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        CONSIGNEE_WARRANTY_WEIGHT,
+      </if>
+      <if test="consigneeContactTel != null">
+        CONSIGNEE_CONTACT_TEL,
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        CONSIGNEE_EXCHANGE_DELIVERY,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="easConsigneeId != null">
+        EAS_CONSIGNEE_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="consigneeId != null">
+        #{consigneeId,jdbcType=DECIMAL},
+      </if>
+      <if test="consigneeCompanyName != null">
+        #{consigneeCompanyName,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeAbbreviation != null">
+        #{consigneeAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeRegisteredAddress != null">
+        #{consigneeRegisteredAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeReceiveAddress != null">
+        #{consigneeReceiveAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consigneeContactName != null">
+        #{consigneeContactName,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        #{consigneeWarrantyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        #{consigneeWarrantyWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeContactTel != null">
+        #{consigneeContactTel,jdbcType=CHAR},
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        #{consigneeExchangeDelivery,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="easConsigneeId != null">
+        #{easConsigneeId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsConsignee">
+    update RMS_CONSIGNEE
+    set CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
+      CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
+      CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
+      CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
+      CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
+      CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
+      CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
+      CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
+      CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=CHAR},
+      CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR}
+    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
+    update RMS_CONSIGNEE
+    <set>
+      <if test="consigneeCompanyName != null">
+        CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeAbbreviation != null">
+        CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeRegisteredAddress != null">
+        CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeReceiveAddress != null">
+        CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeRegistrationTime != null">
+        CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="consigneeContactName != null">
+        CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="consigneeContactTel != null">
+        CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=CHAR},
+      </if>
+      <if test="consigneeExchangeDelivery != null">
+        CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="easConsigneeId != null">
+        EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <include refid="select" />
+    where CONSIGNEE_ID = #{consigneeId,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_CONSIGNEE 
+      (CONSIGNEE_ID, 
+      CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, 
+      CONSIGNEE_REGISTERED_ADDRESS, CONSIGNEE_RECEIVE_ADDRESS, 
+      CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, 
+      CONSIGNEE_WARRANTY_AMOUNT, CONSIGNEE_WARRANTY_WEIGHT, 
+      CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED, 
+      EAS_CONSIGNEE_ID)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.consigneeId,jdbcType=DECIMAL}, 
+      #{item.consigneeCompanyName,jdbcType=VARCHAR}, #{item.consigneeAbbreviation,jdbcType=VARCHAR}, 
+      #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}, #{item.consigneeReceiveAddress,jdbcType=VARCHAR}, 
+      #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}, #{item.consigneeContactName,jdbcType=VARCHAR}, 
+      #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}, #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}, 
+      #{item.consigneeContactTel,jdbcType=CHAR}, #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, 
+      #{item.easConsigneeId,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_CONSIGNEE
+     set
+       CONSIGNEE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
+       </foreach>
+       ,CONSIGNEE_COMPANY_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCompanyName,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_ABBREVIATION=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeAbbreviation,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_REGISTERED_ADDRESS=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_RECEIVE_ADDRESS=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeReceiveAddress,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_REGISTRATION_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,CONSIGNEE_CONTACT_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactName,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_WARRANTY_AMOUNT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}
+       </foreach>
+       ,CONSIGNEE_WARRANTY_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}
+       </foreach>
+       ,CONSIGNEE_CONTACT_TEL=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactTel,jdbcType=CHAR}
+       </foreach>
+       ,CONSIGNEE_EXCHANGE_DELIVERY=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,EAS_CONSIGNEE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.easConsigneeId,jdbcType=VARCHAR}
+       </foreach>
+     where CONSIGNEE_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.consigneeId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_CONSIGNEE
+    where CONSIGNEE_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
+  
 </mapper>

+ 32 - 31
src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -15,18 +15,18 @@
         <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="EAS_MATERIAL_ID" jdbcType="VARCHAR" 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, 
+    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.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">
@@ -80,7 +80,7 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
             </if>
-            <if test="easMaterialId != null">
+            <if test="easMaterialId != null and easMaterialId != ''">
                 and EAS_MATERIAL_ID = #{easMaterialId}
             </if>
             <if test="deleted != null">
@@ -129,8 +129,8 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
             </if>
-            <if test="easMaterialId != null">
-                and EAS_MATERIAL_ID = #{easMaterialId}
+            <if test="easMaterialId != null and easMaterialId != ''">
+                and EAS_MATERIAL_ID LIKE '%${easMaterialId}%'
             </if>
             <if test="deleted != null">
                 and DELETED = #{deleted}
@@ -181,7 +181,7 @@
         <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
             or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
         </if>
-        <if test="easMaterialId != null">
+        <if test="easMaterialId != null and easMaterialId != ''">
             or EAS_MATERIAL_ID = #{easMaterialId}
         </if>
         <if test="deleted != null">
@@ -200,7 +200,7 @@
                 #{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})
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{easMaterialId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsMaterial">
         insert into RMS_MATERIAL
@@ -292,7 +292,7 @@
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                #{easMaterialId,jdbcType=DECIMAL},
+                #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
@@ -313,7 +313,7 @@
             UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR},
-            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=DECIMAL},
+            EAS_MATERIAL_ID        = #{easMaterialId,jdbcType=VARCHAR},
             DELETED                = #{deleted,jdbcType=DECIMAL}
         where MATERIAL_ID = #{materialId,jdbcType=DECIMAL}
     </update>
@@ -357,7 +357,7 @@
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easMaterialId != null">
-                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=DECIMAL},
+                EAS_MATERIAL_ID = #{easMaterialId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
@@ -396,7 +396,7 @@
         #{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.insertUpdateRemark,jdbcType=VARCHAR}, #{item.easMaterialId,jdbcType=VARCHAR},
         #{item.deleted,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
@@ -404,80 +404,81 @@
         update RMS_MATERIAL
         set
         MATERIAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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 collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
+            when #{item.materialId,jdbcType=DECIMAL} then #{item.easMaterialId,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
-        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case MATERIAL_ID" close="end">
             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=",">
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{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=",">
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
+
     <!-- 展示物资信息 -->
     <select id="getMaterialList" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *

+ 89 - 100
src/main/resources/com/steerinfo/dil/mapper/RmsSupplierMapper.xml

@@ -2,66 +2,62 @@
 <!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"/>
+        <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="VARCHAR" 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, 
+    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.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
+        SELECT <include refid="columns"/> FROM RMS_SUPPLIER
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM RMS_SUPPLIER t
+        SELECT <include refid="columns_alias"/> FROM RMS_SUPPLIER t
     </sql>
     <sql id="where">
         <where>
@@ -146,7 +142,7 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
             </if>
-            <if test="easSupplierId != null">
+            <if test="easSupplierId != null and easSupplierId != ''">
                 and EAS_SUPPLIER_ID = #{easSupplierId}
             </if>
             <if test="deleted != null">
@@ -243,8 +239,8 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
             </if>
-            <if test="easSupplierId != null">
-                and EAS_SUPPLIER_ID = #{easSupplierId}
+            <if test="easSupplierId != null and easSupplierId != ''">
+                and EAS_SUPPLIER_ID LIKE '%${easSupplierId}%'
             </if>
             <if test="deleted != null">
                 and DELETED = #{deleted}
@@ -258,8 +254,7 @@
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from RMS_SUPPLIER
+        delete from RMS_SUPPLIER
         where SUPPLIER_ID = #{supplierId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -343,7 +338,7 @@
         <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
             or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
         </if>
-        <if test="easSupplierId != null">
+        <if test="easSupplierId != null and easSupplierId != ''">
             or EAS_SUPPLIER_ID = #{easSupplierId}
         </if>
         <if test="deleted != null">
@@ -370,24 +365,18 @@
                                   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},
+        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},
+                #{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},
+                #{supplierContactsName,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{easSupplierId,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{supplierBusinessLicense,jdbcType=BLOB},
                 #{supplierBusinessAblelicense,jdbcType=BLOB})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsSupplier">
@@ -570,7 +559,7 @@
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easSupplierId != null">
-                #{easSupplierId,jdbcType=DECIMAL},
+                #{easSupplierId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
@@ -585,36 +574,36 @@
     </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},
+        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}
+            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=VARCHAR},
+            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">
@@ -699,7 +688,7 @@
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
             <if test="easSupplierId != null">
-                EAS_SUPPLIER_ID = #{easSupplierId,jdbcType=DECIMAL},
+                EAS_SUPPLIER_ID = #{easSupplierId,jdbcType=VARCHAR},
             </if>
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
@@ -759,8 +748,7 @@
         #{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.easSupplierId,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, #{item.supplierBusinessLicense,jdbcType=BLOB},
         #{item.supplierBusinessAblelicense,jdbcType=BLOB} from dual
     </foreach> )
     </insert>
@@ -877,7 +865,7 @@
         </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}
+            when #{item.supplierId,jdbcType=DECIMAL} then #{item.easSupplierId,jdbcType=VARCHAR}
         </foreach>
         ,DELETED=
         <foreach collection="list" item="item" index="index" separator=" " open="case SUPPLIER_ID" close="end">
@@ -906,6 +894,7 @@
     <!-- 友情提示!!!-->
     <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
 
+
     <!-- 查询供应商列表 -->
     <select id="getSupplierList" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *