'修复物料接口bug'

pom.xml

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

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

@@ -30,16 +30,16 @@ public class BmstrainDetailsOrderController extends BaseRESTfulController {
     /**
      * 采购火运详单接口
      *
-     * @param StatementId
+     * @param statementId
      * @return
      */
     @ApiModelProperty(value = "采购火运详单接口")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "StatementId", value = "账单主键id", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "statementId", value = "账单主键id", required = true, dataType = "Integer"),
     })
     @PostMapping("/getPurchaseTrainDetailsOrder")
-    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(@RequestParam Integer StatementId) {
-        List<Map<String, Object>> mapList = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(@RequestParam Integer statementId) {
+        List<Map<String, Object>> mapList = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(statementId);
         return mapList;
     }
 

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

@@ -41,12 +41,12 @@ public class BmstruckStatementController extends BaseRESTfulController {
     }
 
     /**
-     * 销售汽运账单接口
+     * 金蝶返回账单接口
      *
      * @param mapValue
      * @return
      */
-    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiModelProperty(value = "金蝶返回账单接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "账单主键id", required = true, dataType = "MAP"),
     })

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @author HUJIANGUO
+ * @create 2021-11-10 11:30
+ */
+@FeignClient(value = "logistic",url = "172.16.33.122:44325")
+public interface EASFeign {
+
+    @PostMapping("api/logistics/AbnormalReturn")
+    Map<String,Object> sendAbnormalReturn(@RequestBody(required = true) Map<String, Object> map);
+
+    @PostMapping("api/logistics/TareApplyFor")
+    Map<String,Object> pushWeightApply(Map<String, Object> map);
+
+}

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

@@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BmsportHandlingFeeMapper extends IBaseMapper<BmsportHandlingFee, BigDecimal> {
     // 得到港口装卸费信息
-    List<Map<String, Object>> getPortFee(Integer feeId);
+    List<Map<String, Object>> getPortFee(BigDecimal feeId);
     // 得到支付单位，发货单位，收货单位
-    Map<String, Object> getOtherMessage(Integer feeId);
+    Map<String, Object> getOtherMessage(BigDecimal feeId);
 }

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

@@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BmsshipDetailsOrderMapper extends IBaseMapper<BmsshipDetailsOrder, BigDecimal> {
     // 采购船运详单
-    List<Map<String, Object>> getPurchaseShipDetails(Integer statementId);
+    List<Map<String, Object>> getPurchaseShipDetails(BigDecimal statementId);
 }

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

@@ -11,7 +11,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BmsshipStatementMapper extends IBaseMapper<BmsshipStatement, BigDecimal> {
     // 采购船运账单
-    Map<String, Object> getShipStatement(Integer statementId);
-
-    List<Map<String, Object>> getOtherMessage(Integer statementId);
+    Map<String, Object> getShipStatement(BigDecimal statementId);
+    // 得到水运费的发货单位和收款单位
+    List<Map<String, Object>> getShipOtherMessage(BigDecimal statementId);
+    // 得到水运费付款单位
+    String getShipPaymentUnit(BigDecimal statementId);
+    // 得到途损费付款单位
+    Map<String,Object> getLossPaymentUnit(BigDecimal statementId);
 }

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

@@ -17,5 +17,5 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
     List<Map<String, Object>> getPurchaseDetailsOrder(BigDecimal detailsId);
 
     // 查询采购汽运账单所需信息
-    Map<String, Object> getStatementMessage(Integer detailsId);
+    Map<String, Object> getStatementMessage(BigDecimal detailsId);
 }

src/main/java/com/steerinfo/dil/model/BmsportHandlingFee.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;
 
@@ -74,6 +75,18 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
 
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 装卸费编号(FEE_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="装卸费编号",required=false)
+    private String feeNo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -174,6 +187,22 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
         this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
     }
 
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getFeeNo() {
+        return feeNo;
+    }
+
+    public void setFeeNo(String feeNo) {
+        this.feeNo = feeNo == null ? null : feeNo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -191,6 +220,8 @@ public class BmsportHandlingFee implements IBasePO<BigDecimal> {
         sb.append(", updateUsername=").append(updateUsername);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", feeNo=").append(feeNo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

src/main/java/com/steerinfo/dil/model/BmsshipStatement.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;
 
@@ -74,6 +75,12 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="费用类型：水运费，途损费，水分检测费",required=false)
     private String statementType;
 
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="批次ID",required=false)
+    private BigDecimal batchId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -174,6 +181,14 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
         this.statementType = statementType == null ? null : statementType.trim();
     }
 
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -191,6 +206,7 @@ public class BmsshipStatement implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", statementType=").append(statementType);
+        sb.append(", batchId=").append(batchId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -54,8 +54,8 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         BigDecimal batchId = amsPurchaseOrderMapper.getBatchId(map);
         // 得到采购员
         String purchaseOrderBuyer = (String) mapVal.get("purchaseOrderBuyer");
-//        // 得到发货单位
-//        String sendUnit = (String) mapVal.get("sendUnit");
+        // 得到发货单位
+        String sendUnit = (String) mapVal.get("sendUnit");
         // 得到采购组织
         String purchaseOrganization = (String) mapVal.get("purchaseOrganization");
         BigDecimal purchasingOrganizationId = amsPurchaseOrderMapper.getOrganizationId(purchaseOrganization);

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

@@ -39,7 +39,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
      */
     @Override
     public Map<String, Object> getPortFee(Integer feeId) {
-        List<Map<String, Object>> mapList = bmsportHandlingFeeMapper.getPortFee(feeId);
+        List<Map<String, Object>> mapList = bmsportHandlingFeeMapper.getPortFee(new BigDecimal(feeId));
         for (Map<String,Object> map : mapList) {
             map.put("detailsNo","");
             map.put("capacityNumber","");
@@ -49,7 +49,7 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
         BigDecimal statementTotalAmount = (BigDecimal) map.get("detailsAmount");
         Date statementTime = (Date) map.get("detailsTime");
         Map<String,Object> mapValue = new HashMap<>();
-        Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(feeId);
+        Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(new BigDecimal(feeId));
         mapValue.put("mapList",mapList);
         mapValue.put("statementTotalAmount",statementTotalAmount);
         mapValue.put("statementTime",statementTime);

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

@@ -43,7 +43,7 @@ public class BmsshipDetailsOrderServiceImpl extends BaseServiceImpl<BmsshipDetai
      */
     @Override
     public List<Map<String, Object>> getPurchaseShipDetails(Integer statementId) {
-        List<Map<String,Object>> mapList = bmsshipDetailsOrderMapper.getPurchaseShipDetails(statementId);
+        List<Map<String,Object>> mapList = bmsshipDetailsOrderMapper.getPurchaseShipDetails(new BigDecimal(statementId));
         return mapList;
     }
 }

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

@@ -4,11 +4,15 @@ 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.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
  * BmsshipStatement服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-11-05 07:35
  * 类描述
@@ -17,8 +21,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：BmsshipStatement服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "bmsshipStatementService")
 public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
@@ -28,14 +32,32 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
 
     /**
      * 采购船运账单
+     *
      * @param statementId
      * @return
      */
     @Override
     public Map<String, Object> getShipStatement(Integer statementId) {
-        Map<String,Object> mapValue = bmsshipStatementMapper.getShipStatement(statementId);
-        List<Map<String,Object>> mapList = bmsshipStatementMapper.getOtherMessage(statementId);
-        Map<String, Object> map = mapList.get(0);
+        Map<String, Object> mapValue = bmsshipStatementMapper.getShipStatement(new BigDecimal(statementId));
+        List<Map<String, Object>> mapList = bmsshipStatementMapper.getShipOtherMessage(new BigDecimal(statementId));
+        String amountType = (String) mapValue.get("amountType");
+        Map<String, Object> map = new HashMap<>();
+        if (amountType.equals("水运费")) {
+            // 发货单位和收款单位
+            Map<String, Object> shipMap = mapList.get(0);
+            // 付款单位
+            String statementPaymentUnit = bmsshipStatementMapper.getShipPaymentUnit(new BigDecimal(statementId));
+            map.putAll(shipMap);
+            map.put("statementPaymentUnit",statementPaymentUnit);
+        }
+        if (amountType.equals("物流途损超标扣款")) {
+            // 付款单位，发货单位，收款单位
+            Map<String,Object> lossMap = bmsshipStatementMapper.getLossPaymentUnit(new BigDecimal(statementId));
+            map.putAll(lossMap);
+        }
+        if (amountType.equals("水分检测费")) {
+
+        }
         mapValue.putAll(map);
         return mapValue;
     }

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

@@ -33,12 +33,12 @@ public class BmstrainDetailsOrderServiceImpl implements IBmstrainDetailsOrderSer
 
     /**
      * 采购火运详单信息
-     * @param StatementId
+     * @param statementId
      * @return
      */
     @Override
-    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer StatementId) {
-        List<Map<String, Object>> mapList = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(StatementId));
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer statementId) {
+        List<Map<String, Object>> mapList = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(statementId));
         String capacityNumber = "";
         String carrierName = "";
         String shipperName = "";

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

@@ -39,21 +39,21 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     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<>();
+        Map<String,Object> mapValue = 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("startPlace","");
-        map.put("endPlace","");
-        map.put("statementNumber",statementNumber);
-        map.put("statementTime",statementTime);
-        map.put("amountType",amountType);
-        map.put("statementTotalAmount",statementExcludTax);
-        map.put("mapList",mapList);
-        map.putAll(statementMap);
-        return map;
+        Map<String,Object> statementMap = bmstruckDetailsOrderMapper.getStatementMessage(new BigDecimal(detailsId));
+        mapValue.put("startPlace","");
+        mapValue.put("endPlace","");
+        mapValue.put("statementNumber",statementNumber);
+        mapValue.put("statementTime",statementTime);
+        mapValue.put("amountType",amountType);
+        mapValue.put("statementTotalAmount",statementExcludTax);
+        mapValue.put("mapList",mapList);
+        mapValue.putAll(statementMap);
+        return mapValue;
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.BmsshipStatementMapper;
+import com.steerinfo.dil.mapper.BmstrainStatementMapper;
 import com.steerinfo.dil.mapper.BmstruckStatementMapper;
 import com.steerinfo.dil.service.IBmstruckStatementService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +28,10 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
 
     @Autowired
     private BmstruckStatementMapper bmstruckStatementMapper;
+    @Autowired
+    BmstrainStatementMapper bmstrainStatementMapper;
+    @Autowired
+    BmsshipStatementMapper bmsshipStatementMapper;
 
     /**
      * 得到汽运账单
@@ -50,10 +56,32 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
      */
     @Override
     public int updateStatement(Map<String, Object> mapValue) {
+        int result = 0;
         String statementNumber = (String) mapValue.get("statementNumber");
-        List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) mapValue.get("detailsNumberList");
-        Double amount = (Double) mapValue.get("amount");
+        List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) mapValue.get("mapList");
+        String amount = (String) mapValue.get("amount");
         String remark = (String) mapValue.get("remark");
-        return 0;
+        if (remark.equals("采购汽运")){
+
+        }
+        if (remark.equals("采购火运")){
+
+        }
+        if (remark.equals("港口装卸费")){
+
+        }
+        if (remark.equals("水运费")){
+
+        }
+        if (remark.equals("水分检测费")){
+
+        }
+        if (remark.equals("物流途损超标扣款")){
+
+        }
+        if (remark.equals("")){
+
+        }
+        return result;
     }
 }

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

@@ -63,8 +63,8 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         // 得到长度
         String materialLengthValue = (String) mapVal.get("materialLength");
         BigDecimal materialLength = null;
-        if (materialLengthValue != null) {
-            materialLength = new BigDecimal(materialLengthValue);;
+        if (materialLengthValue != null && !materialLengthValue.equals("")) {
+            materialLength = new BigDecimal(materialLengthValue);
         }
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");

src/main/java/mypackage/WSFaceFacade.wsdl

@@ -0,0 +1,154 @@
+
+<!-- saved from url=(0042)http://172.16.62.243:56898/ormrpc/services -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta></head><body><h2>And now... Some Services</h2>
+<ul>
+<li>WSFaceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>invokeJson
+</li><li>invokeXML
+</li><li>thirdJson
+</li><li>thirdXML
+</li><li>writeFileJson
+</li><li>readFileJson
+</li><li>writeFileXml
+</li><li>readFileXml
+</li></ul>
+<li>WSMoveInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSMoveInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSEmployee <a href="http://172.16.62.243:56898/ormrpc/services/WSWSEmployee?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getAddressList
+</li><li>importPersonCollection
+</li><li>importPersonInfo
+</li><li>getAdminPositionByPerson
+</li></ul>
+<li>WSWSAccountBalance <a href="http://172.16.62.243:56898/ormrpc/services/WSWSAccountBalance?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>closePeriod
+</li><li>findObjectByNumber
+</li><li>deleteAccountBalance
+</li><li>importAccountBalance
+</li></ul>
+<li>WSWSVoucher <a href="http://172.16.62.243:56898/ormrpc/services/WSWSVoucher?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importVoucher
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li></ul>
+<li>WSReceiveBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSReceiveBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSPurInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSPurInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>EASLogin <a href="http://172.16.62.243:56898/ormrpc/services/EASLogin?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>login
+</li><li>login
+</li><li>login
+</li><li>logout
+</li><li>loginByLtpaToken
+</li></ul>
+<li>WSImportCSSPManagerFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSImportCSSPManagerFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importCSSPStandard
+</li><li>importCustomerInfo
+</li><li>importCustomerInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierCompanyInfo
+</li><li>assignSupplier
+</li><li>deleteSupplier
+</li><li>importCustomerCompanyInfo
+</li><li>assignCustomer
+</li><li>importSupplierPurchaseInfo
+</li><li>deleteCustomer
+</li><li>importCSSPGroup
+</li><li>importCustomerSaleInfo
+</li></ul>
+<li>WSWSSaleOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSSaleOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>WSExternalDataExchangeFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSExternalDataExchangeFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>test
+</li><li>exportData
+</li><li>importData
+</li><li>importBizData
+</li></ul>
+<li>WSOtherIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSPurOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSPurOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>AdminService <a href="http://172.16.62.243:56898/ormrpc/services/AdminService?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>AdminService
+</li></ul>
+<li>WSSaleIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSSaleIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSOtherBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSManufactureRecBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSManufactureRecBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>Version <a href="http://172.16.62.243:56898/ormrpc/services/Version?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getVersion
+</li></ul>
+<li>WSGLWebServiceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSGLWebServiceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getOrg
+</li><li>getAsstActType
+</li><li>getVoucher
+</li><li>getAccount
+</li><li>deleteVoucher
+</li><li>checkVoucher
+</li><li>importAccountBalance
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li><li>deleteVoucherByID
+</li><li>exploreVoucher
+</li><li>importInitAccountBalance
+</li><li>importAssistBalance
+</li><li>findVoucher
+</li><li>importInitAssistBalance
+</li><li>deleteBalance
+</li><li>getAcctType
+</li><li>getAcctTypeDetail
+</li><li>getAccountBalance
+</li><li>getAssitBalance
+</li></ul>
+<li>WSWsMessageCenterFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWsMessageCenterFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>addMessage
+</li><li>getDisposeAssignCount
+</li><li>addNewAssign
+</li><li>updateMessageStatus
+</li><li>clearMessageCount
+</li><li>getMessageXML
+</li><li>getMessageList
+</li><li>getBillUrl
+</li><li>getUndiposeAssignCount
+</li><li>removeMsgBySID
+</li><li>addBMCMessage
+</li><li>checkMessageCount
+</li><li>getBMCMessageCount
+</li><li>dumpCompleteAssign
+</li><li>removeMsgByID
+</li></ul>
+</ul>
+</body></html>

src/main/java/mypackage/WSFaceFacade1.wsdl

@@ -0,0 +1,154 @@
+
+<!-- saved from url=(0042)http://172.16.62.243:56898/ormrpc/services -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta></head><body><h2>And now... Some Services</h2>
+<ul>
+<li>WSFaceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>invokeJson
+</li><li>invokeXML
+</li><li>thirdJson
+</li><li>thirdXML
+</li><li>writeFileJson
+</li><li>readFileJson
+</li><li>writeFileXml
+</li><li>readFileXml
+</li></ul>
+<li>WSMoveInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSMoveInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSEmployee <a href="http://172.16.62.243:56898/ormrpc/services/WSWSEmployee?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getAddressList
+</li><li>importPersonCollection
+</li><li>importPersonInfo
+</li><li>getAdminPositionByPerson
+</li></ul>
+<li>WSWSAccountBalance <a href="http://172.16.62.243:56898/ormrpc/services/WSWSAccountBalance?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>closePeriod
+</li><li>findObjectByNumber
+</li><li>deleteAccountBalance
+</li><li>importAccountBalance
+</li></ul>
+<li>WSWSVoucher <a href="http://172.16.62.243:56898/ormrpc/services/WSWSVoucher?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importVoucher
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li></ul>
+<li>WSReceiveBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSReceiveBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSPurInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSPurInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>EASLogin <a href="http://172.16.62.243:56898/ormrpc/services/EASLogin?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>login
+</li><li>login
+</li><li>login
+</li><li>logout
+</li><li>loginByLtpaToken
+</li></ul>
+<li>WSImportCSSPManagerFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSImportCSSPManagerFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importCSSPStandard
+</li><li>importCustomerInfo
+</li><li>importCustomerInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierCompanyInfo
+</li><li>assignSupplier
+</li><li>deleteSupplier
+</li><li>importCustomerCompanyInfo
+</li><li>assignCustomer
+</li><li>importSupplierPurchaseInfo
+</li><li>deleteCustomer
+</li><li>importCSSPGroup
+</li><li>importCustomerSaleInfo
+</li></ul>
+<li>WSWSSaleOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSSaleOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>WSExternalDataExchangeFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSExternalDataExchangeFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>test
+</li><li>exportData
+</li><li>importData
+</li><li>importBizData
+</li></ul>
+<li>WSOtherIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSPurOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSPurOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>AdminService <a href="http://172.16.62.243:56898/ormrpc/services/AdminService?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>AdminService
+</li></ul>
+<li>WSSaleIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSSaleIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSOtherBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSManufactureRecBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSManufactureRecBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>Version <a href="http://172.16.62.243:56898/ormrpc/services/Version?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getVersion
+</li></ul>
+<li>WSGLWebServiceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSGLWebServiceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getOrg
+</li><li>getAsstActType
+</li><li>getVoucher
+</li><li>getAccount
+</li><li>deleteVoucher
+</li><li>checkVoucher
+</li><li>importAccountBalance
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li><li>deleteVoucherByID
+</li><li>exploreVoucher
+</li><li>importInitAccountBalance
+</li><li>importAssistBalance
+</li><li>findVoucher
+</li><li>importInitAssistBalance
+</li><li>deleteBalance
+</li><li>getAcctType
+</li><li>getAcctTypeDetail
+</li><li>getAccountBalance
+</li><li>getAssitBalance
+</li></ul>
+<li>WSWsMessageCenterFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWsMessageCenterFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>addMessage
+</li><li>getDisposeAssignCount
+</li><li>addNewAssign
+</li><li>updateMessageStatus
+</li><li>clearMessageCount
+</li><li>getMessageXML
+</li><li>getMessageList
+</li><li>getBillUrl
+</li><li>getUndiposeAssignCount
+</li><li>removeMsgBySID
+</li><li>addBMCMessage
+</li><li>checkMessageCount
+</li><li>getBMCMessageCount
+</li><li>dumpCompleteAssign
+</li><li>removeMsgByID
+</li></ul>
+</ul>
+</body></html>

src/main/java/mypackage/WSFaceFacade2.wsdl

@@ -0,0 +1,154 @@
+
+<!-- saved from url=(0042)http://172.16.62.243:56898/ormrpc/services -->
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></meta></head><body><h2>And now... Some Services</h2>
+<ul>
+<li>WSFaceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>invokeJson
+</li><li>invokeXML
+</li><li>thirdJson
+</li><li>thirdXML
+</li><li>writeFileJson
+</li><li>readFileJson
+</li><li>writeFileXml
+</li><li>readFileXml
+</li></ul>
+<li>WSMoveInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSMoveInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSEmployee <a href="http://172.16.62.243:56898/ormrpc/services/WSWSEmployee?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getAddressList
+</li><li>importPersonCollection
+</li><li>importPersonInfo
+</li><li>getAdminPositionByPerson
+</li></ul>
+<li>WSWSAccountBalance <a href="http://172.16.62.243:56898/ormrpc/services/WSWSAccountBalance?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>closePeriod
+</li><li>findObjectByNumber
+</li><li>deleteAccountBalance
+</li><li>importAccountBalance
+</li></ul>
+<li>WSWSVoucher <a href="http://172.16.62.243:56898/ormrpc/services/WSWSVoucher?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importVoucher
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li></ul>
+<li>WSReceiveBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSReceiveBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSPurInWarehsBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSPurInWarehsBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>EASLogin <a href="http://172.16.62.243:56898/ormrpc/services/EASLogin?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>login
+</li><li>login
+</li><li>login
+</li><li>logout
+</li><li>loginByLtpaToken
+</li></ul>
+<li>WSImportCSSPManagerFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSImportCSSPManagerFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importCSSPStandard
+</li><li>importCustomerInfo
+</li><li>importCustomerInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierInfo
+</li><li>importSupplierCompanyInfo
+</li><li>assignSupplier
+</li><li>deleteSupplier
+</li><li>importCustomerCompanyInfo
+</li><li>assignCustomer
+</li><li>importSupplierPurchaseInfo
+</li><li>deleteCustomer
+</li><li>importCSSPGroup
+</li><li>importCustomerSaleInfo
+</li></ul>
+<li>WSWSSaleOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSSaleOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>WSExternalDataExchangeFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSExternalDataExchangeFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>test
+</li><li>exportData
+</li><li>importData
+</li><li>importBizData
+</li></ul>
+<li>WSOtherIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSWSPurOrderFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWSPurOrderFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>ImportData
+</li></ul>
+<li>AdminService <a href="http://172.16.62.243:56898/ormrpc/services/AdminService?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>AdminService
+</li></ul>
+<li>WSSaleIssueBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSSaleIssueBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>WSOtherBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSOtherBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>submit
+</li></ul>
+<li>WSManufactureRecBillFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSManufactureRecBillFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>importData
+</li></ul>
+<li>Version <a href="http://172.16.62.243:56898/ormrpc/services/Version?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getVersion
+</li></ul>
+<li>WSGLWebServiceFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSGLWebServiceFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>getOrg
+</li><li>getAsstActType
+</li><li>getVoucher
+</li><li>getAccount
+</li><li>deleteVoucher
+</li><li>checkVoucher
+</li><li>importAccountBalance
+</li><li>importVoucher
+</li><li>importVoucherOfReturnID
+</li><li>deleteVoucherByID
+</li><li>exploreVoucher
+</li><li>importInitAccountBalance
+</li><li>importAssistBalance
+</li><li>findVoucher
+</li><li>importInitAssistBalance
+</li><li>deleteBalance
+</li><li>getAcctType
+</li><li>getAcctTypeDetail
+</li><li>getAccountBalance
+</li><li>getAssitBalance
+</li></ul>
+<li>WSWsMessageCenterFacade <a href="http://172.16.62.243:56898/ormrpc/services/WSWsMessageCenterFacade?wsdl"><i>(wsdl)</i></a></li>
+<ul>
+<li>addMessage
+</li><li>getDisposeAssignCount
+</li><li>addNewAssign
+</li><li>updateMessageStatus
+</li><li>clearMessageCount
+</li><li>getMessageXML
+</li><li>getMessageList
+</li><li>getBillUrl
+</li><li>getUndiposeAssignCount
+</li><li>removeMsgBySID
+</li><li>addBMCMessage
+</li><li>checkMessageCount
+</li><li>getBMCMessageCount
+</li><li>dumpCompleteAssign
+</li><li>removeMsgByID
+</li></ul>
+</ul>
+</body></html>

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

@@ -2,23 +2,23 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.AmsPurchaseOrderMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsPurchaseOrder">
-        <id column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId" />
-        <result column="PURCHASE_ORDER_NO" jdbcType="VARCHAR" property="purchaseOrderNo" />
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-        <result column="PURCHASE_ORDER_DATE" jdbcType="TIMESTAMP" property="purchaseOrderDate" />
-        <result column="SUPPLIER_UNIT_ID" jdbcType="DECIMAL" property="supplierUnitId" />
-        <result column="PURCHASING_ORGANIZATION_ID" jdbcType="DECIMAL" property="purchasingOrganizationId" />
-        <result column="PURCHASE_ORDER_BUYER" jdbcType="VARCHAR" property="purchaseOrderBuyer" />
-        <result column="PUCHASE_ORDER_MATERIAL_NUMBER" jdbcType="DECIMAL" property="puchaseOrderMaterialNumber" />
-        <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId" />
-        <result column="PUCHASE_ORDER_DELIVERY_DATE" jdbcType="TIMESTAMP" property="puchaseOrderDeliveryDate" />
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
-        <result column="EAS_PURCHASE_ORDER_ID" jdbcType="VARCHAR" property="easPurchaseOrderId" />
+        <id column="PURCHASE_ORDER_ID" jdbcType="DECIMAL" property="purchaseOrderId"/>
+        <result column="PURCHASE_ORDER_NO" jdbcType="VARCHAR" property="purchaseOrderNo"/>
+        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
+        <result column="PURCHASE_ORDER_DATE" jdbcType="TIMESTAMP" property="purchaseOrderDate"/>
+        <result column="SUPPLIER_UNIT_ID" jdbcType="DECIMAL" property="supplierUnitId"/>
+        <result column="PURCHASING_ORGANIZATION_ID" jdbcType="DECIMAL" property="purchasingOrganizationId"/>
+        <result column="PURCHASE_ORDER_BUYER" jdbcType="VARCHAR" property="purchaseOrderBuyer"/>
+        <result column="PUCHASE_ORDER_MATERIAL_NUMBER" jdbcType="DECIMAL" property="puchaseOrderMaterialNumber"/>
+        <result column="RECEIVE_UNIT_ID" jdbcType="DECIMAL" property="receiveUnitId"/>
+        <result column="PUCHASE_ORDER_DELIVERY_DATE" jdbcType="TIMESTAMP" property="puchaseOrderDeliveryDate"/>
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <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,14 @@
     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>
@@ -149,7 +153,8 @@
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete from AMS_PURCHASE_ORDER
+        delete
+        from AMS_PURCHASE_ORDER
         where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -211,16 +216,16 @@
                                         PUCHASE_ORDER_MATERIAL_NUMBER, RECEIVE_UNIT_ID,
                                         PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME,
                                         INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                        INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID
-        )
+                                        INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID)
         values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR},
-                #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP}, #{supplierUnitId,jdbcType=DECIMAL},
+                #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP},
+                #{supplierUnitId,jdbcType=DECIMAL},
                 #{purchasingOrganizationId,jdbcType=DECIMAL}, #{purchaseOrderBuyer,jdbcType=VARCHAR},
                 #{puchaseOrderMaterialNumber,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
                 #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easPurchaseOrderId,jdbcType=VARCHAR}
-               )
+                #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{easPurchaseOrderId,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
         insert into AMS_PURCHASE_ORDER
@@ -333,22 +338,22 @@
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
         update AMS_PURCHASE_ORDER
-        set PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
-            BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
-            SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
-            PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
-            PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
+        set PURCHASE_ORDER_NO             = #{purchaseOrderNo,jdbcType=VARCHAR},
+            BATCH_ID                      = #{batchId,jdbcType=DECIMAL},
+            PURCHASE_ORDER_DATE           = #{purchaseOrderDate,jdbcType=TIMESTAMP},
+            SUPPLIER_UNIT_ID              = #{supplierUnitId,jdbcType=DECIMAL},
+            PURCHASING_ORGANIZATION_ID    = #{purchasingOrganizationId,jdbcType=DECIMAL},
+            PURCHASE_ORDER_BUYER          = #{purchaseOrderBuyer,jdbcType=VARCHAR},
             PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-            RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
-            PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-            DELETED = #{deleted,jdbcType=DECIMAL},
-            EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR}
+            RECEIVE_UNIT_ID               = #{receiveUnitId,jdbcType=DECIMAL},
+            PUCHASE_ORDER_DELIVERY_DATE   = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+            INSERT_USERNAME               = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME                   = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME               = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME                   = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK          = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED                       = #{deleted,jdbcType=DECIMAL},
+            EAS_PURCHASE_ORDER_ID         = #{easPurchaseOrderId,jdbcType=VARCHAR}
         where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -431,7 +436,8 @@
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.purchaseOrderId,jdbcType=DECIMAL},
-        #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseOrderDate,jdbcType=TIMESTAMP},
+        #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.batchId,jdbcType=DECIMAL},
+        #{item.purchaseOrderDate,jdbcType=TIMESTAMP},
         #{item.supplierUnitId,jdbcType=DECIMAL}, #{item.purchasingOrganizationId,jdbcType=DECIMAL},
         #{item.purchaseOrderBuyer,jdbcType=VARCHAR}, #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL},
         #{item.receiveUnitId,jdbcType=DECIMAL}, #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
@@ -537,10 +543,11 @@
     </select>
 
     <!-- 通过供应商代码得到供应商id -->
-    <select id="getSupplierId" parameterType="java.lang.String" resultType="DECIMAL">
+    <select id="getSupplierId" parameterType="java.util.Map" resultType="DECIMAL">
         SELECT rs.SUPPLIER_ID
         FROM RMS_SUPPLIER rs
         WHERE rs.SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
+          AND rs.SUPPLIER_NAME = #{supplierName}
     </select>
 
     <!-- 通过名称查询收货单位 -->

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

@@ -13,15 +13,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="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <result column="FEE_NO" jdbcType="VARCHAR" property="feeNo"/>
     </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
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED, FEE_NO
     </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
+    t.FEE_VALUE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.FEE_NO
     </sql>
     <sql id="select">
         SELECT
@@ -68,6 +71,12 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
             </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="feeNo != null and feeNo != ''">
+                and FEE_NO = #{feeNo}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -105,6 +114,12 @@
             <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
                 and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
             </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="feeNo != null and feeNo != ''">
+                and FEE_NO LIKE '%${feeNo}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -145,17 +160,25 @@
         <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
             or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
         </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+        <if test="feeNo != null and feeNo != ''">
+            or FEE_NO = #{feeNo}
+        </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)
+                                          UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                          FEE_NO)
         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})
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{feeNo,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
         insert into BMSPORT_HANDLING_FEE
@@ -193,6 +216,12 @@
             <if test="insertUpdateRemark != null">
                 INSERT_UPDATE_REMARK,
             </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+            <if test="feeNo != null">
+                FEE_NO,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="feeId != null">
@@ -228,6 +257,12 @@
             <if test="insertUpdateRemark != null">
                 #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="feeNo != null">
+                #{feeNo,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
@@ -241,7 +276,9 @@
             INSERT_TIME           = #{insertTime,jdbcType=TIMESTAMP},
             UPDATE_USERNAME       = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME           = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK  = #{insertUpdateRemark,jdbcType=VARCHAR}
+            INSERT_UPDATE_REMARK  = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED               = #{deleted,jdbcType=DECIMAL},
+            FEE_NO                = #{feeNo,jdbcType=VARCHAR}
         where FEE_ID = #{feeId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsportHandlingFee">
@@ -277,6 +314,12 @@
             <if test="insertUpdateRemark != null">
                 INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="feeNo != null">
+                FEE_NO = #{feeNo,jdbcType=VARCHAR},
+            </if>
         </set>
         where FEE_ID = #{feeId,jdbcType=DECIMAL}
     </update>
@@ -299,7 +342,8 @@
         FEE_MATERIAL_TONNAGE, PRICE_ID,
         FEE_VALUE, INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK)
+        INSERT_UPDATE_REMARK, DELETED,
+        FEE_NO)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.feeId,jdbcType=DECIMAL},
@@ -308,72 +352,83 @@
         #{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
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.feeNo,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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             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=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
             when #{item.feeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
+        ,DELETED=
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        ,FEE_NO=
+        <foreach collection="list" item="item" index="index" separator=" " open="case FEE_ID" close="end">
+            when #{item.feeId,jdbcType=DECIMAL} then #{item.feeNo,jdbcType=VARCHAR}
+        </foreach>
         where FEE_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{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=",">
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
     <select id="getPortFee" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BHF.INSERT_TIME          AS "detailsTime",
+        SELECT BHF.FEE_NO               AS "detailsNo",
+               BHF.INSERT_TIME          AS "detailsTime",
                RP1.PORT_NAME            AS "startPlace",
                RP2.PORT_NAME            AS "endPlace",
                BHF.FEE_MATERIAL_TONNAGE AS "materialNumber",
@@ -411,5 +466,6 @@
                            ON RS.SHIPPER_ID = APO.RECEIVE_UNIT_ID
                  LEFT JOIN RMS_SUPPLIER RSU
                            ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        WHERE BHF.FEE_ID = #{feeId}
     </select>
 </mapper>

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

@@ -429,16 +429,16 @@
 
     <!-- 采购船运详单 -->
     <select id="getPurchaseShipDetails" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BDO.DETAILS_NO                    AS "detailsNo",
-               BDO.DETAILS_TIME                  AS "detailsTime",
-               RC.CAPACITY_NUMBER                AS "capacityNumber",
-               RP1.PORT_NAME                     AS "startPlace",
-               RP3.PORT_NAME                     AS "endPlace",
-               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
-               BDO.DETAILS_AMOUNT                AS "detailsAmount",
-               RP2.PORT_NAME                     AS "carrierName",
-               RM.MATERIAL_NAME                  AS "materialName",
-               RM.MATERIAL_CODE                  AS "materialCode"
+        SELECT DISTINCT BDO.DETAILS_NO                    AS "detailsNo",
+                        BDO.DETAILS_TIME                  AS "detailsTime",
+                        RC.CAPACITY_NUMBER                AS "capacityNumber",
+                        RP1.PORT_NAME                     AS "startPlace",
+                        RP3.PORT_NAME                     AS "endPlace",
+                        APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
+                        BDO.DETAILS_AMOUNT                AS "detailsAmount",
+                        RP2.PORT_NAME                     AS "carrierName",
+                        RM.MATERIAL_NAME                  AS "materialName",
+                        RM.MATERIAL_CODE                  AS "materialCode"
         FROM BMSSHIP_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
                            ON BDS.DETAILS_ID = BDO.DETAILS_ID

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

@@ -13,16 +13,17 @@
         <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"/>
+        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId"/>
     </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
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    STATEMENT_TYPE, BATCH_ID
     </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
+    t.STATEMENT_DATE, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.STATEMENT_TYPE, t.BATCH_ID
     </sql>
     <sql id="select">
         SELECT
@@ -69,6 +70,9 @@
             <if test="statementType != null and statementType != ''">
                 and STATEMENT_TYPE = #{statementType}
             </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -106,6 +110,9 @@
             <if test="statementType != null and statementType != ''">
                 and STATEMENT_TYPE LIKE '%${statementType}%'
             </if>
+            <if test="batchId != null">
+                and BATCH_ID = #{batchId}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -146,19 +153,24 @@
         <if test="statementType != null and statementType != ''">
             or STATEMENT_TYPE = #{statementType}
         </if>
+        <if test="batchId != null">
+            or BATCH_ID = #{batchId}
+        </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)
+                                       UPDATE_TIME, INSERT_UPDATE_REMARK, STATEMENT_TYPE,
+                                       BATCH_ID)
         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})
+                #{statementType,jdbcType=VARCHAR},
+                #{batchId,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
         insert into BMSSHIP_STATEMENT
@@ -196,6 +208,9 @@
             <if test="statementType != null">
                 STATEMENT_TYPE,
             </if>
+            <if test="batchId != null">
+                BATCH_ID,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="statementId != null">
@@ -231,6 +246,9 @@
             <if test="statementType != null">
                 #{statementType,jdbcType=VARCHAR},
             </if>
+            <if test="batchId != null">
+                #{batchId,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.BmsshipStatement">
@@ -244,7 +262,8 @@
             UPDATE_USERNAME        = #{updateUsername,jdbcType=VARCHAR},
             UPDATE_TIME            = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK   = #{insertUpdateRemark,jdbcType=VARCHAR},
-            STATEMENT_TYPE         = #{statementType,jdbcType=VARCHAR}
+            STATEMENT_TYPE         = #{statementType,jdbcType=VARCHAR},
+            BATCH_ID               = #{batchId,jdbcType=DECIMAL}
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.BmsshipStatement">
@@ -280,6 +299,9 @@
             <if test="statementType != null">
                 STATEMENT_TYPE = #{statementType,jdbcType=VARCHAR},
             </if>
+            <if test="batchId != null">
+                BATCH_ID = #{batchId,jdbcType=DECIMAL},
+            </if>
         </set>
         where STATEMENT_ID = #{statementId,jdbcType=DECIMAL}
     </update>
@@ -302,8 +324,8 @@
         STATEMENT_TOTAL_AMOUNT, STATEMENT_DATE,
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, STATEMENT_TYPE
-        )
+        INSERT_UPDATE_REMARK, STATEMENT_TYPE,
+        BATCH_ID)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.statementId,jdbcType=DECIMAL},
@@ -311,8 +333,8 @@
         #{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
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.statementType,jdbcType=VARCHAR},
+        #{item.batchId,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -362,6 +384,10 @@
         <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>
+        ,BATCH_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case STATEMENT_ID" separator=" ">
+            when #{item.statementId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+        </foreach>
         where STATEMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.statementId,jdbcType=DECIMAL}
@@ -376,22 +402,52 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+    <!-- 得到账单数据 -->
     <select id="getShipStatement" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT BS.STATEMENT_NO           AS "statementNo",
                BS.STATEMENT_DATE         AS "statementTime",
-               RS.SHIPPER_NAME           AS "statementPaymentUnit",
                RS.SHIPPER_NAME           AS "consigneeCompanyName",
                BS.STATEMENT_TOTAL_AMOUNT AS "statementTotalAmount",
                BS.STATEMENT_TYPE         AS "amountType"
         FROM BMSSHIP_STATEMENT BS
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
+        WHERE BS.STATEMENT_ID = #{statementId}
+    </select>
+
+    <!-- 得到水运费付款单位 -->
+    <select id="getShipPaymentUnit" parameterType="DECIMAL" resultType="java.lang.String">
+        SELECT RS.SHIPPER_NAME AS "statementPaymentUnit"
+        FROM BMSSHIP_STATEMENT BS
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
+        WHERE BS.STATEMENT_ID = #{statementId}
+    </select>
+
+    <!-- 得到途损费付款单位,收款单位，发货单位 -->
+    <select id="getLossPaymentUnit" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RC.CARRIER_NAME            AS "statementPaymentUnit",
+               RSH.SHIPPER_NAME           AS "collectionName",
+               RS.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        FROM BMSSHIP_STATEMENT BS
+                 LEFT JOIN RMS_CARRIER RC
+                           ON RC.CARRIER_ID = BS.STATEMENT_SHIPPER_ID
+                 LEFT JOIN DIL_BATCH DB
+                           ON DB.BATCH_ID = BS.BATCH_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                 LEFT JOIN RMS_SUPPLIER RS
+                           ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        WHERE BS.STATEMENT_ID = #{statementId}
     </select>
 
-    <!-- 发货单位和收款单位 -->
-    <select id="getOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
+    <!-- 水运费发货单位和收款单位 -->
+    <select id="getShipOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit",
-               RP.PORT_NAME AS "collectionName"
+               RP.PORT_NAME               AS "collectionName"
         FROM BMSSHIP_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID
@@ -403,5 +459,6 @@
                            ON ADN.BATCH_ID = APO.BATCH_ID
                  LEFT JOIN RMS_PORT RP
                            ON RP.PORT_ID = ADN.CARRIER_ID
+        WHERE BDS.STATEMENT_ID = #{statementId}
     </select>
 </mapper>

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

@@ -513,5 +513,6 @@
                            ON RCR.CARRIER_ID = AP.CARRIER_ID
                  LEFT JOIN RMS_SUPPLIER RSU
                            ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        WHERE BDO.DETAILS_ID = #{detailsId}
     </select>
 </mapper>