'修改结算字段，采购订单新增批次'

pom.xml

@@ -95,6 +95,50 @@
             <version>1.0</version>
         </dependency>
 
+        <!-- webService所需依赖 -->
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-discovery</groupId>
+            <artifactId>commons-discovery</artifactId>
+            <version>0.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis-jaxrpc</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis</groupId>
+            <artifactId>axis-saaj</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>wsdl4j</groupId>
+            <artifactId>wsdl4j</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+
+        <!--还是引入其中一个实现类-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.21</version>
+        </dependency>
 
     </dependencies>
     <build>
@@ -111,7 +155,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>BMSPORT_HANDLING_FEE</table>
+                        <table>DIL_BATCH</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -47,7 +47,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
      */
     @ApiModelProperty(value = "销售订单管理对接接口/修改")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "saleNumber", value = "WXSDD-20210909-00000001", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "saleNumber", value = "WXSDD-20210909-00000007", required = true, dataType = "String"),
             @ApiImplicitParam(name = "saleAccountBalance", value = "3000", required = true, dataType = "String"),
             @ApiImplicitParam(name = "saleCurrentOrderAmount", value = "1000", required = true, dataType = "String"),
             @ApiImplicitParam(name = "saleHistoricalOrderAmount", value = "5000", required = true, dataType = "String"),

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

@@ -25,4 +25,7 @@ public interface AmsPurchaseOrderMapper extends IBaseMapper<AmsPurchaseOrder, Bi
 
     // 通过采购组织名称查询id
     BigDecimal getOrganizationId(String purchaseOrganization);
+
+    // 通过唯一编码得到物资id
+    BigDecimal getMaterialId(String materialCode);
 }

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

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilBatch;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface DilBatchMapper extends IBaseMapper<DilBatch, Short> {
+
+    @Select("select seq_DIL_BATCH.nextval from dual")
+    BigDecimal selectBatchId();
+}

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 org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -30,6 +31,7 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
     /**
      * 订单日期(PURCHASE_ORDER_DATE,TIMESTAMP,7)
      */
+    @DateTimeFormat(pattern = "yyyy-mm-dd hh24:mi:ss")
     @ApiModelProperty(value="订单日期",required=false)
     private Date purchaseOrderDate;
 

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

@@ -0,0 +1,154 @@
+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 DilBatch implements IBasePO<BigDecimal> {
+    /**
+     * 批次ID(BATCH_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="批次ID",required=true)
+    private BigDecimal batchId;
+
+    /**
+     * 外轮船名(RESULT_FOREIGN_SHIP_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="外轮船名",required=false)
+    private String resultForeignShipName;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 记录创建人(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.batchId;
+    }
+
+    @Override
+    public void setId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public BigDecimal getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(BigDecimal batchId) {
+        this.batchId = batchId;
+    }
+
+    public String getResultForeignShipName() {
+        return resultForeignShipName;
+    }
+
+    public void setResultForeignShipName(String resultForeignShipName) {
+        this.resultForeignShipName = resultForeignShipName == null ? null : resultForeignShipName.trim();
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    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(", batchId=").append(batchId);
+        sb.append(", resultForeignShipName=").append(resultForeignShipName);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.service;
+
+/**
+ * DilBatch服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-13 10:12
+ * 类描述
+ * 修订历史：
+ * 日期：2021-11-13
+ * 作者：generator
+ * 参考：
+ * 描述：DilBatch服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface IDilBatchService {
+
+}

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

@@ -1,10 +1,13 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsPurchaseOrderMapper;
+import com.steerinfo.dil.mapper.DilBatchMapper;
 import com.steerinfo.dil.model.AmsPurchaseOrder;
+import com.steerinfo.dil.model.DilBatch;
 import com.steerinfo.dil.service.IAmsPurchaseOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -30,12 +33,15 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
 
     @Autowired
     private AmsPurchaseOrderMapper amsPurchaseOrderMapper;
+    @Autowired
+    DilBatchMapper dilBatchMapper;
 
     /**
      * 采购订单管理
      * @param mapVal
      * @return
      */
+    @Transactional
     @Override
     public int operationPurchaseOrder(Map<String, Object> mapVal) {
         int result = 0;
@@ -49,13 +55,30 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         String resultForeignShipName = (String) mapVal.get("resultForeignShipName");
         Map<String,Object> map = new HashMap<>();
         map.put("materialCode",materialCode);
+        BigDecimal materialId = amsPurchaseOrderMapper.getMaterialId(materialCode);
         map.put("resultForeignShipName",resultForeignShipName);
         // 得到批次
-        BigDecimal batchId = amsPurchaseOrderMapper.getBatchId(map);
+        BigDecimal batchId;
+        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
+            DilBatch dilBatch = new DilBatch();
+            batchId = dilBatchMapper.selectBatchId();
+            dilBatch.setBatchId(batchId);
+            dilBatch.setResultForeignShipName(resultForeignShipName);
+            dilBatch.setMaterialId(materialId);
+            dilBatch.setInsertTime(new Date());
+            dilBatch.setUpdateTime(new Date());
+            dilBatch.setInsertUsername("admin");
+            dilBatch.setUpdateUsername("admin");
+            dilBatch.setInsertUpdateRemark("无");
+            dilBatchMapper.insertSelective(dilBatch);
+        }
+        else {
+            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);
@@ -65,7 +88,7 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         // 得到订货数量
         String purchaseOrderMaterialNumber = (String) mapVal.get("purchaseOrderMaterialNumber");
         // 得到订单日期
-        Date purchaseOrderDate = new Date((Long) mapVal.get("purchaseOrderDate"));
+        Date purchaseOrderDate = new Date ((Long) mapVal.get("purchaseOrderDate"));
         // 得到供应商代码
         String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
         BigDecimal supplierId = amsPurchaseOrderMapper.getSupplierId(supplierDutyParagraph);
@@ -81,6 +104,11 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setReceiveUnitId(shipperId);
         amsPurchaseOrder.setPurchasingOrganizationId(purchasingOrganizationId);
         amsPurchaseOrder.setEasPurchaseOrderId(EASPurchaseId);
+        amsPurchaseOrder.setInsertTime(new Date());
+        amsPurchaseOrder.setInsertUsername("admin");
+        amsPurchaseOrder.setUpdateTime(new Date());
+        amsPurchaseOrder.setUpdateUsername("admin");
+        amsPurchaseOrder.setInsertUpdateRemark("无");
         Map<String,Object> map1 = new HashMap<>();
         BigDecimal deleted = new BigDecimal(0);
         map1.put("purchaseOrderNo",purchaseOrderNo);

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

@@ -39,24 +39,23 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
      */
     @Override
     public Map<String, Object> getPortFee(Integer feeId) {
-        List<Map<String, Object>> mapList = bmsportHandlingFeeMapper.getPortFee(new BigDecimal(feeId));
-        for (Map<String,Object> map : mapList) {
-            map.put("detailsNo","");
-            map.put("capacityNumber","");
-            map.put("carrierName","");
+        List<Map<String, Object>> entries = bmsportHandlingFeeMapper.getPortFee(new BigDecimal(feeId));
+        for (Map<String,Object> map : entries) {
+            map.put("carNum","");
+            map.put("forwarder","");
         }
-        Map<String, Object> map = mapList.get(0);
-        BigDecimal statementTotalAmount = (BigDecimal) map.get("detailsAmount");
-        Date statementTime = (Date) map.get("detailsTime");
+        Map<String, Object> map = entries.get(0);
+        BigDecimal statementTotalAmount = (BigDecimal) map.get("amount");
+        Date statementTime = (Date) map.get("detailDate");
         Map<String,Object> mapValue = new HashMap<>();
         Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(new BigDecimal(feeId));
-        mapValue.put("mapList",mapList);
-        mapValue.put("statementTotalAmount",statementTotalAmount);
-        mapValue.put("statementTime",statementTime);
-        mapValue.put("statementNo","");
+        mapValue.put("entries",entries);
+        mapValue.put("allAmount",statementTotalAmount);
+        mapValue.put("bizDate",statementTime);
+        mapValue.put("billNum","");
         String amountType = "港口装卸费";
         mapValue.put("amountType",amountType);
-        mapValue.put("collectionName","");
+        mapValue.put("collectionUnitName","");
         mapValue.putAll(otherMap);
         return mapValue;
     }

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

@@ -46,9 +46,9 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
             // 发货单位和收款单位
             Map<String, Object> shipMap = mapList.get(0);
             // 付款单位
-            String statementPaymentUnit = bmsshipStatementMapper.getShipPaymentUnit(new BigDecimal(statementId));
+            String payUnitName = bmsshipStatementMapper.getShipPaymentUnit(new BigDecimal(statementId));
             map.putAll(shipMap);
-            map.put("statementPaymentUnit",statementPaymentUnit);
+            map.put("payUnitName",payUnitName);
         }
         if (amountType.equals("物流途损超标扣款")) {
             // 付款单位，发货单位，收款单位
@@ -56,7 +56,12 @@ public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
             map.putAll(lossMap);
         }
         if (amountType.equals("水分检测费")) {
-
+            String payUnitName = "";
+            String forwordUnitNum = "";
+            String collectionUnitName = "";
+            map.put("payUnitName",payUnitName);
+            map.put("forwordUnitNum",forwordUnitNum);
+            map.put("collectionUnitName",collectionUnitName);
         }
         mapValue.putAll(map);
         return mapValue;

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

@@ -38,17 +38,17 @@ public class BmstrainDetailsOrderServiceImpl implements IBmstrainDetailsOrderSer
      */
     @Override
     public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer statementId) {
-        List<Map<String, Object>> mapList = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(statementId));
-        String capacityNumber = "";
-        String carrierName = "";
-        String shipperName = "";
-        String consigneeCompanyName = "";
-        for (Map<String,Object> map: mapList) {
-            map.put("capacityNumber",capacityNumber);
-            map.put("carrierName",carrierName);
-            map.put("startPlace",shipperName);
-            map.put("endPlace",consigneeCompanyName);
+        List<Map<String, Object>> entries = bmstrainDetailsOrderMapper.getPurchaseTrainDetailsOrder(new BigDecimal(statementId));
+        String carNum = "";
+        String forwarder = "";
+        String startingPoint = "";
+        String endPoint = "";
+        for (Map<String,Object> map: entries) {
+            map.put("carNum",carNum);
+            map.put("forwarder",forwarder);
+            map.put("startingPoint",startingPoint);
+            map.put("endPoint",endPoint);
         }
-        return mapList;
+        return entries;
     }
 }

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

@@ -42,9 +42,9 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
         List<Map<String,Object>> mapList = bmstrainStatementMapper.getCarrierAndReceiver(new BigDecimal(statementId));
         Map<String, Object> map = mapList.get(0);
         String amountType = "采购火运";
-        String collectionName = "成都铁路局";
+        String collectionUnitName = "成都铁路局";
         mapValue.put("amountType",amountType);
-        mapValue.put("collectionName",collectionName);
+        mapValue.put("collectionUnitName",collectionUnitName);
         mapValue.putAll(map);
         return mapValue;
     }

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

@@ -37,21 +37,23 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
      */
     @Override
     public Map<String, Object> getPurchaseDetailsOrder(Integer detailsId) {
-        List<Map<String, Object>> mapList = bmstruckDetailsOrderMapper.getPurchaseDetailsOrder(new BigDecimal(detailsId));
+        List<Map<String, Object>> entries = bmstruckDetailsOrderMapper.getPurchaseDetailsOrder(new BigDecimal(detailsId));
+        for (Map<String,Object> map : entries) {
+            map.put("startingPoint","");
+            map.put("endPoint","");
+        }
         String amountType = "采购汽运";
         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();
+        String billNum = "";
+        Date bizDate = (Date) (entries.get(0).get("bizDate"));
+        BigDecimal amount = (BigDecimal) (entries.get(0).get("amount"));
+        Double statementExcludTax = amount.doubleValue();
         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("billNum",billNum);
+        mapValue.put("bizDate",bizDate);
         mapValue.put("amountType",amountType);
-        mapValue.put("statementTotalAmount",statementExcludTax);
-        mapValue.put("mapList",mapList);
+        mapValue.put("amount",statementExcludTax);
+        mapValue.put("entries",entries);
         mapValue.putAll(statementMap);
         return mapValue;
     }
@@ -63,7 +65,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
      */
     @Override
     public List<Map<String, Object>> getSaleDetailsOrder(Integer statementId) {
-        List<Map<String, Object>> mapList = bmstruckDetailsOrderMapper.getSaleDetailsOrder(new BigDecimal(statementId));
-        return mapList;
+        List<Map<String, Object>> entries = bmstruckDetailsOrderMapper.getSaleDetailsOrder(new BigDecimal(statementId));
+        return entries;
     }
 }

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

@@ -1,12 +1,12 @@
 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.mapper.*;
+import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IBmstruckStatementService;
 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;
 
@@ -32,6 +32,10 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
     BmstrainStatementMapper bmstrainStatementMapper;
     @Autowired
     BmsshipStatementMapper bmsshipStatementMapper;
+    @Autowired
+    BmstruckDetailsOrderMapper bmstruckDetailsOrderMapper;
+    @Autowired
+    BmsportHandlingFeeMapper bmsportHandlingFeeMapper;
 
     /**
      * 得到汽运账单
@@ -57,27 +61,60 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
     @Override
     public int updateStatement(Map<String, Object> mapValue) {
         int result = 0;
+        Map<String,Object> parametersMap = new HashMap<>();
         String statementNumber = (String) mapValue.get("statementNumber");
         List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) mapValue.get("mapList");
         String amount = (String) mapValue.get("amount");
         String remark = (String) mapValue.get("remark");
         if (remark.equals("采购汽运")){
-
+            Map<String, Object> map = detailsNumberList.get(0);
+            String detailsNo = (String) map.get("detailsNo");
+            parametersMap.put("detailsNo",detailsNo);
+            List<BmstruckDetailsOrder> bmstruckDetailsOrders = bmstruckDetailsOrderMapper.selectByParameters(parametersMap);
+            BmstruckDetailsOrder bmstruckDetailsOrder = bmstruckDetailsOrders.get(0);
+            // 修改详单金额
+            bmstruckDetailsOrder.setDetailsAmount(new BigDecimal(amount));
+            bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
         }
         if (remark.equals("采购火运")){
-
+            parametersMap.put("statementNumber",statementNumber);
+            List<BmstrainStatement> bmstrainStatements = bmstrainStatementMapper.selectByParameters(parametersMap);
+            BmstrainStatement bmstrainStatement = bmstrainStatements.get(0);
+            // 修改火运账单金额
+            bmstrainStatement.setStatementTotalAmount(new BigDecimal(amount));
+            bmstrainStatementMapper.updateByPrimaryKeySelective(bmstrainStatement);
         }
         if (remark.equals("港口装卸费")){
-
+            parametersMap.put("statementNumber",statementNumber);
+            List<BmsportHandlingFee> bmsportHandlingFees = bmsportHandlingFeeMapper.selectByParameters(parametersMap);
+            BmsportHandlingFee bmsportHandlingFee = bmsportHandlingFees.get(0);
+            // 修改结算金额
+            bmsportHandlingFee.setFeeValue(new BigDecimal(amount));
+            bmsportHandlingFeeMapper.updateByPrimaryKeySelective(bmsportHandlingFee);
         }
         if (remark.equals("水运费")){
-
+            parametersMap.put("statementNumber",statementNumber);
+            List<BmsshipStatement> bmsshipStatements = bmsshipStatementMapper.selectByParameters(parametersMap);
+            BmsshipStatement bmsshipStatement = bmsshipStatements.get(0);
+            // 修改结算金额
+            bmsshipStatement.setStatementTotalAmount(new BigDecimal(amount));
+            bmsshipStatementMapper.updateByPrimaryKeySelective(bmsshipStatement);
         }
         if (remark.equals("水分检测费")){
-
+            parametersMap.put("statementNumber",statementNumber);
+            List<BmsshipStatement> bmsshipStatements = bmsshipStatementMapper.selectByParameters(parametersMap);
+            BmsshipStatement bmsshipStatement = bmsshipStatements.get(0);
+            // 修改结算金额
+            bmsshipStatement.setStatementTotalAmount(new BigDecimal(amount));
+            bmsshipStatementMapper.updateByPrimaryKeySelective(bmsshipStatement);
         }
         if (remark.equals("物流途损超标扣款")){
-
+            parametersMap.put("statementNumber",statementNumber);
+            List<BmsshipStatement> bmsshipStatements = bmsshipStatementMapper.selectByParameters(parametersMap);
+            BmsshipStatement bmsshipStatement = bmsshipStatements.get(0);
+            // 修改结算金额
+            bmsshipStatement.setStatementTotalAmount(new BigDecimal(amount));
+            bmsshipStatementMapper.updateByPrimaryKeySelective(bmsshipStatement);
         }
         if (remark.equals("")){
 

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

@@ -0,0 +1,27 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.DilBatchMapper;
+import com.steerinfo.dil.service.IDilBatchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * DilBatch服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-11-13 10:12
+ * 类描述
+ * 修订历史：
+ * 日期：2021-11-13
+ * 作者：generator
+ * 参考：
+ * 描述：DilBatch服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "dilBatchService")
+public class DilBatchServiceImpl implements IDilBatchService {
+
+    @Autowired
+    private DilBatchMapper dilBatchMapper;
+
+}

src/main/java/com/steerinfo/dil/wsdl/SoapUtil.java

@@ -0,0 +1,62 @@
+package com.steerinfo.dil.wsdl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.net.*;
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/13 17:29
+ * @Version:V2.0
+ */
+
+public class SoapUtil {
+
+    /*
+     * 远程访问SOAP协议接口
+     *
+     * @param url： 服务接口地址"http://192.168.0.120:8222/HelloWorld?wsdl"
+     * @param isClass：接口类名
+     * @param isMethod： 接口方法名
+     * @param sendSoapString： soap协议xml格式访问接口
+     *
+     * @return  soap协议xml格式
+     *
+     * @备注：有四种请求头格式1、SOAP 1.1； 2、SOAP 1.2 ； 3、HTTP GET； 4、HTTP POST
+     * 参考---》http://www.webxml.com.cn/WebServices/WeatherWebService.asmx?op=getWeatherbyCityName
+     */
+    public static String getWebServiceAndSoap(String url,String isClass,String isMethod,StringBuffer sendSoapString) throws IOException {
+        String soap = sendSoapString.toString();
+        if (soap == null) {
+            return null;
+        }
+        URL soapUrl = new URL(url);
+        URLConnection conn = soapUrl.openConnection();
+        conn.setUseCaches(false);
+        conn.setDoInput(true);
+        conn.setDoOutput(true);
+        conn.setRequestProperty("Content-Length",
+                Integer.toString(soap.length()));
+        conn.setRequestProperty("Content-Type", "text/xml; charset=utf-8");
+        // 调用的接口方法是
+        conn.setRequestProperty(isClass,isMethod);
+        OutputStream os = conn.getOutputStream();
+        OutputStreamWriter osw = new OutputStreamWriter(os, "utf-8");
+        osw.write(soap);
+        osw.flush();
+        osw.close();
+        // 获取webserivce返回的流
+        InputStream is = conn.getInputStream();
+        if (is!=null) {
+            byte[] bytes = new byte[0];
+            bytes = new byte[is.available()];
+            is.read(bytes);
+            String str = new String(bytes);
+            return str;
+        }else {
+            return null;
+        }
+    }
+}

src/main/java/com/steerinfo/dil/wsdl/WsdlSoapTest.java

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.wsdl;
+
+import java.io.IOException;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/13 17:31
+ * @Version:V2.0
+ */
+public class WsdlSoapTest {
+
+    public static void main(String args[]) {
+        // TODO Auto-generated method stub
+        StringBuffer sendSoapString = new StringBuffer();
+        sendSoapString.append("<soapenv:Envelope xmlns:soapenv=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:tes=\"http://test03/\">");
+        sendSoapString.append("   <soapenv:Header/>");
+        sendSoapString.append("   <soapenv:Body>");
+        sendSoapString.append("      <tes:invokeJsonRequest>");
+        sendSoapString.append("         <arg0>66</arg0>");
+        sendSoapString.append("         <arg1>33</arg1>");
+        sendSoapString.append("      </tes:invokeJsonRequest>");
+        sendSoapString.append("   </soapenv:Body>");
+        sendSoapString.append("</soapenv:Envelope>");
+        try {
+            String ret= SoapUtil.getWebServiceAndSoap("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade?wsdl","invokeJson","invokeJsonRequest", sendSoapString);
+            System.out.println(ret);
+        } catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/mypackage/WSFaceFacade.wsdl

@@ -1,154 +0,0 @@
-
-<!-- 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

@@ -1,154 +0,0 @@
-
-<!-- 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

@@ -1,154 +0,0 @@
-
-<!-- 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

@@ -547,7 +547,6 @@
         SELECT rs.SUPPLIER_ID
         FROM RMS_SUPPLIER rs
         WHERE rs.SUPPLIER_DUTY_PARAGRAPH = #{supplierDutyParagraph}
-          AND rs.SUPPLIER_NAME = #{supplierName}
     </select>
 
     <!-- 通过名称查询收货单位 -->
@@ -564,4 +563,10 @@
         WHERE RS.SHIPPER_NAME = #{purchaseOrganization}
     </select>
 
+    <select id="getMaterialId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT RM.MATERIAL_ID AS "materialId"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_CODE = #{materialCode}
+    </select>
+
 </mapper>

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

@@ -427,14 +427,14 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
     <select id="getPortFee" parameterType="DECIMAL" resultType="java.util.Map">
-        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",
-               BHF.FEE_VALUE            AS "detailsAmount",
-               RM.MATERIAL_NAME         AS "materialName",
-               RM.MATERIAL_CODE         AS "materialCode"
+        SELECT BHF.FEE_NO               AS "detailNum",
+               BHF.INSERT_TIME          AS "detailDate",
+               RP1.PORT_NAME            AS "startingPoint",
+               RP2.PORT_NAME            AS "endPoint",
+               BHF.FEE_MATERIAL_TONNAGE AS "qty",
+               BHF.FEE_VALUE            AS "amount",
+               RM.MATERIAL_NAME         AS "matName",
+               RM.MATERIAL_CODE         AS "matNum"
         FROM BMSPORT_HANDLING_FEE BHF
                  LEFT JOIN RMS_MATERIAL RM
                            ON RM.MATERIAL_ID = BHF.MATERIAL_ID
@@ -453,9 +453,9 @@
     </select>
 
     <select id="getOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RS.SHIPPER_NAME             AS "statementPaymentUnit",
-               RS.SHIPPER_NAME             AS "consigneeCompanyName",
-               RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        SELECT RS.SHIPPER_NAME             AS "payUnitName",
+               RS.SHIPPER_NAME             AS "receivedUnitName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum"
         FROM BMSPORT_HANDLING_FEE BHF
                  LEFT JOIN DIL_BATCH DB
                            ON DB.RESULT_FOREIGN_SHIP_NAME = BHF.FEE_FOREIGN_SHIP_NAME

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

@@ -429,16 +429,16 @@
 
     <!-- 采购船运详单 -->
     <select id="getPurchaseShipDetails" parameterType="DECIMAL" resultType="java.util.Map">
-        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"
+        SELECT DISTINCT BDO.DETAILS_NO                    AS "detailNum",
+                        BDO.DETAILS_TIME                  AS "detailDate",
+                        RC.CAPACITY_NUMBER                AS "carNum",
+                        RP1.PORT_NAME                     AS "startingPoint",
+                        RP3.PORT_NAME                     AS "endPoint",
+                        APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "qty",
+                        BDO.DETAILS_AMOUNT                AS "amount",
+                        RP2.PORT_NAME                     AS "forwarder",
+                        RM.MATERIAL_NAME                  AS "matName",
+                        RM.MATERIAL_CODE                  AS "matNum"
         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

@@ -405,10 +405,10 @@
 
     <!-- 得到账单数据 -->
     <select id="getShipStatement" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BS.STATEMENT_NO           AS "statementNo",
-               BS.STATEMENT_DATE         AS "statementTime",
-               RS.SHIPPER_NAME           AS "consigneeCompanyName",
-               BS.STATEMENT_TOTAL_AMOUNT AS "statementTotalAmount",
+        SELECT BS.STATEMENT_NO           AS "billNum",
+               BS.STATEMENT_DATE         AS "bizDate",
+               RS.SHIPPER_NAME           AS "receivedUnitName",
+               BS.STATEMENT_TOTAL_AMOUNT AS "allAmount",
                BS.STATEMENT_TYPE         AS "amountType"
         FROM BMSSHIP_STATEMENT BS
                  LEFT JOIN RMS_SHIPPER RS
@@ -418,7 +418,7 @@
 
     <!-- 得到水运费付款单位 -->
     <select id="getShipPaymentUnit" parameterType="DECIMAL" resultType="java.lang.String">
-        SELECT RS.SHIPPER_NAME AS "statementPaymentUnit"
+        SELECT RS.SHIPPER_NAME AS "payUnitName"
         FROM BMSSHIP_STATEMENT BS
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
@@ -427,9 +427,9 @@
 
     <!-- 得到途损费付款单位,收款单位，发货单位 -->
     <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"
+        SELECT RC.CARRIER_NAME            AS "payUnitName",
+               RSH.SHIPPER_NAME           AS "collectionUnitName",
+               RS.SUPPLIER_DUTY_PARAGRAPH AS "payUnitNum"
         FROM BMSSHIP_STATEMENT BS
                  LEFT JOIN RMS_CARRIER RC
                            ON RC.CARRIER_ID = BS.STATEMENT_SHIPPER_ID
@@ -446,8 +446,8 @@
 
     <!-- 水运费发货单位和收款单位 -->
     <select id="getShipOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit",
-               RP.PORT_NAME               AS "collectionName"
+        SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RP.PORT_NAME               AS "collectionUnitName"
         FROM BMSSHIP_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID

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

@@ -481,12 +481,12 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="getPurchaseTrainDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BDO.DETAILS_NO                    AS "detailsNo",
-               BDO.DETAILS_TIME                  AS "detailsTime",
-               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
-               BDO.DETAILS_AMOUNT                AS "detailsAmount",
-               RM.MATERIAL_CODE                  AS "materialCode",
-               RM.MATERIAL_NAME                  AS "materialName"
+        SELECT BDO.DETAILS_NO                    AS "detailNum",
+               BDO.DETAILS_TIME                  AS "detailDate",
+               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "qty",
+               BDO.DETAILS_AMOUNT                AS "amount",
+               RM.MATERIAL_CODE                  AS "matNum",
+               RM.MATERIAL_NAME                  AS "matName"
         FROM BMSTRAIN_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSTRAIN_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID

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

@@ -503,9 +503,9 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   
   <select id="getTrainSettlement" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT
-
-FROM BMSTRAIN_SETTLEMENT BS
+--     SELECT
+--
+-- FROM BMSTRAIN_SETTLEMENT BS
 
   </select>
 </mapper>

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

@@ -349,11 +349,11 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <select id="getTrainStatement" 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"
+        SELECT BS.STATEMENT_NO           AS "billNum",
+               BS.STATEMENT_DATE         AS "bizDate",
+               RS.SHIPPER_NAME           AS "payUnitName",
+               RS.SHIPPER_NAME           AS "receivedUnitName",
+               BS.STATEMENT_TOTAL_AMOUNT AS "allAmount"
         FROM BMSTRAIN_STATEMENT BS
                  LEFT JOIN RMS_SHIPPER RS
                            ON RS.SHIPPER_ID = BS.STATEMENT_SHIPPER_ID
@@ -361,7 +361,7 @@
     </select>
 
     <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        SELECT RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum"
         FROM BMSTRAIN_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSTRAIN_DETAILS_ORDER BDO
                            ON BDS.DETAILS_ID = BDO.DETAILS_ID

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

@@ -428,16 +428,16 @@
 
     <!-- 查询销售计费详单 -->
     <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 "startPlace",
-                        RCO.CONSIGNEE_COMPANY_NAME AS "endPlace",
-                        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"
+        SELECT DISTINCT BDO.DETAILS_NO             AS "detailNum",
+                        BDO.DETAILS_TIME           AS "detailDate",
+                        RCA.CAPACITY_NUMBER        AS "carNum",
+                        RS.SHIPPER_NAME            AS "startingPoint",
+                        RCO.CONSIGNEE_COMPANY_NAME AS "endPoint",
+                        ASP.PLAN_MATERIAL_NUMBER   AS "qty",
+                        BDO.DETAILS_AMOUNT         AS "amount",
+                        RC.CARRIER_NAME            AS "forwarder",
+                        RM.MATERIAL_NAME           AS "matName",
+                        RM.MATERIAL_CODE           AS "matNum"
         FROM BMSTRUCK_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID
@@ -468,14 +468,14 @@
 
     <!-- 查询采购计费详单 -->
     <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"
+        SELECT BDO.DETAILS_NO                    AS "detailNum",
+               BDO.DETAILS_TIME                  AS "detailDate",
+               RCP.CAPACITY_NUMBER               AS "carNum",
+               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "qty",
+               BDO.DETAILS_AMOUNT                AS "amount",
+               RCR.CARRIER_NAME                  AS "forwarder",
+               RM.MATERIAL_CODE                  AS "matNum",
+               RM.MATERIAL_NAME                  AS "matName"
         FROM BMSTRUCK_DETAILS_ORDER BDO
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON OO.ORDER_ID = BDO.ORDER_ID
@@ -498,10 +498,10 @@
 
     <!-- 查询采购汽运账单所需信息 -->
     <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"
+        SELECT RS.SHIPPER_NAME             AS "receivedUnitName",
+               RCR.CARRIER_NAME            AS "collectionUnitName",
+               RS.SHIPPER_NAME             AS "payUnitName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum"
         FROM BMSTRUCK_DETAILS_ORDER BDO
                  LEFT JOIN AMS_PURCHASE_ORDER APO
                            ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID

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

@@ -456,20 +456,19 @@
 
     <!-- 得到账单信息 -->
     <select id="getStatement" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BS.STATEMENT_NUMBER       AS "statementNo",
-               BS.INSERT_TIME            AS "statementTime",
-               BS.STATEMENT_PAYMENT_UNIT AS "statementPaymentUnit",
-               BS.STATEMENT_PAYMENT_UNIT AS "statementSendUnit",
-               BS.STATEMENT_EXCLUD_TAX   AS "statementTotalAmount",
-               BS.STATEMENT_TYPE         AS "statementType"
+        SELECT BS.STATEMENT_NUMBER       AS "billNum",
+               BS.INSERT_TIME            AS "bizDate",
+               BS.STATEMENT_PAYMENT_UNIT AS "payUnitName",
+               BS.STATEMENT_PAYMENT_UNIT AS "forwordUnitName",
+               BS.STATEMENT_EXCLUD_TAX   AS "allAmount"
         FROM BMSTRUCK_STATEMENT BS
         WHERE BS.STATEMENT_ID = #{statementId}
     </select>
 
     <!-- 得到收款单位和收货单位 -->
     <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
-               RCA.CARRIER_NAME          AS "collectionName"
+        SELECT RC.CONSIGNEE_COMPANY_NAME AS "receivedUnitName",
+               RCA.CARRIER_NAME          AS "collectionUnitName"
         FROM BMSTRUCK_STATEMENT BS
                  LEFT JOIN BMSTRUCK_DETAILS_STATEMENT BDS
                            ON BS.STATEMENT_ID = BDS.STATEMENT_ID

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

@@ -0,0 +1,293 @@
+<?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.DilBatchMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.DilBatch">
+    <id column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
+    <result column="RESULT_FOREIGN_SHIP_NAME" jdbcType="VARCHAR" property="resultForeignShipName" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <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">
+    BATCH_ID, RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.BATCH_ID, t.RESULT_FOREIGN_SHIP_NAME, t.MATERIAL_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 DIL_BATCH
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM DIL_BATCH t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="resultForeignShipName != null and resultForeignShipName != ''">
+        and RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </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="batchId != null">
+        and BATCH_ID = #{batchId}
+      </if>
+      <if test="resultForeignShipName != null and resultForeignShipName != ''">
+        and RESULT_FOREIGN_SHIP_NAME LIKE '%${resultForeignShipName}%'
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from DIL_BATCH
+    where BATCH_ID = #{batchId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from DIL_BATCH
+    where 1!=1 
+      <if test="resultForeignShipName != null and resultForeignShipName != ''">
+        or RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName}
+      </if>
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </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.DilBatch">
+    insert into DIL_BATCH (BATCH_ID, RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, 
+      INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK)
+    values (#{batchId,jdbcType=DECIMAL}, #{resultForeignShipName,jdbcType=VARCHAR}, #{materialId,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.DilBatch">
+    insert into DIL_BATCH
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="batchId != null">
+        BATCH_ID,
+      </if>
+      <if test="resultForeignShipName != null">
+        RESULT_FOREIGN_SHIP_NAME,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_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="batchId != null">
+        #{batchId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultForeignShipName != null">
+        #{resultForeignShipName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        #{materialId,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.DilBatch">
+    update DIL_BATCH
+    set RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName,jdbcType=VARCHAR},
+      MATERIAL_ID = #{materialId,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 BATCH_ID = #{batchId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.DilBatch">
+    update DIL_BATCH
+    <set>
+      <if test="resultForeignShipName != null">
+        RESULT_FOREIGN_SHIP_NAME = #{resultForeignShipName,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,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 BATCH_ID = #{batchId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where BATCH_ID = #{batchId,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 DIL_BATCH 
+      (BATCH_ID, 
+      RESULT_FOREIGN_SHIP_NAME, MATERIAL_ID, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.batchId,jdbcType=DECIMAL}, 
+      #{item.resultForeignShipName,jdbcType=VARCHAR}, #{item.materialId,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 DIL_BATCH
+     set
+       BATCH_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_FOREIGN_SHIP_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.resultForeignShipName,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case BATCH_ID" separator=" ">
+          when #{item.batchId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where BATCH_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.batchId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from DIL_BATCH
+    where BATCH_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  
+  
+</mapper>