shaj

pom.xml

@@ -109,6 +109,64 @@
             <artifactId>jdom2</artifactId>
             <version>2.0.6</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.22</version>
+        </dependency>
+
+        <!--        还是引入其中一个实现类-->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.7.22</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.41</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
@@ -124,10 +182,6 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <table>rms_car_driver</table>-->
-<!--                        <table>RMS_SHIPPER</table>-->
-<!--                        <table>RMS_CARRIER</table>-->
-                        <table>TMSTRUCK_WEIGHT_RESULT</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -3,6 +3,7 @@ package com.steerinfo;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -13,12 +14,12 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @Date 2021/4/21 14:32
  * @Version 1.0
  */
-@SpringBootApplication
 @ServletComponentScan
 @EnableScheduling
 @MapperScan({"com.steerinfo.dil.mapper"})
 @EnableFeignClients(basePackages = "com.steerinfo.dil.feign")
 @EnableDiscoveryClient
+@SpringBootApplication(exclude = SecurityAutoConfiguration.class)
 public class DilApplicationMain {
     public static void main(String[] args) {
         SpringApplication.run(DilApplicationMain.class,args);

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

@@ -3,6 +3,8 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.service.impl.AmsSaleOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -44,16 +46,16 @@ public class AmsSaleOrderController extends BaseRESTfulController {
      * @return
      */
     @ApiModelProperty(value = "销售订单管理对接接口/修改")
+    @ApiImplicitParams({
+            @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"),
+    })
     @PostMapping("/operationSaleOrder")
     public RESTfulResult operationSaleOrder(@RequestBody Map<String, Object> mapVal) {
         int result = amsSaleOrderService.operationSaleOrder(mapVal);
         return success(result);
     }
 
-
-
-
-
-
-
 }

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

@@ -26,12 +26,12 @@ public class BmsportHandlingFeeController extends BaseRESTfulController {
     BmsportHandlingFeeServiceImpl bmsportHandlingFeeService;
 
     /**
-     * 销售汽运账单接口
+     * 港口装卸费结算接口
      *
      * @param feeId
      * @return
      */
-    @ApiModelProperty(value = "销售汽运账单接口")
+    @ApiModelProperty(value = "港口装卸费结算接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "feeId", value = "港口装卸费主键id", required = true, dataType = "Integer"),
     })

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

@@ -39,8 +39,8 @@ public class BmsshipDetailsOrderController extends BaseRESTfulController {
     })
     @PostMapping("/getPurchaseShipDetails")
     public List<Map<String, Object>> getPurchaseShipDetails(@RequestParam Integer statementId) {
-        List<Map<String,Object>> mapList = bmsshipDetailsOrderService.getPurchaseShipDetails(statementId);
-        return mapList;
+        List<Map<String,Object>> entries = bmsshipDetailsOrderService.getPurchaseShipDetails(statementId);
+        return entries;
     }
 
 

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

@@ -35,8 +35,8 @@ public class BmsshipStatementController extends BaseRESTfulController {
     })
     @PostMapping("/getShipStatement")
     public Map<String, Object> getShipStatement(@RequestParam Integer statementId) {
-        Map<String,Object> mapValue = bmsshipStatementService.getShipStatement(statementId);
-        return mapValue;
+        Map<String,Object> head = bmsshipStatementService.getShipStatement(statementId);
+        return head;
     }
 
 

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

@@ -30,17 +30,17 @@ 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>> mapValue = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(StatementId);
-        return mapValue;
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(@RequestParam Integer statementId) {
+        List<Map<String, Object>> entries = bmstrainDetailsOrderService.getPurchaseTrainDetailsOrder(statementId);
+        return entries;
     }
 
 

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

@@ -36,8 +36,8 @@ public class BmstrainStatementController extends BaseRESTfulController {
     })
     @PostMapping("/getTrainStatement")
     public Map<String, Object> getTrainStatement(@RequestParam Integer statementId) {
-        Map<String,Object> mapValue = bmstrainStatementService.getTrainStatement(statementId);
-        return mapValue;
+        Map<String,Object> head = bmstrainStatementService.getTrainStatement(statementId);
+        return head;
     }
 
     /**

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

@@ -39,8 +39,8 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
     })
     @PostMapping("/getPurchaseDetailsOrder")
     public Map<String, Object> getPurchaseDetailsOrder(@RequestParam Integer detailsId) {
-        Map<String,Object> mapValue = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
-        return mapValue;
+        Map<String,Object> input = bmstruckDetailsOrderService.getPurchaseDetailsOrder(detailsId);
+        return input;
     }
 
     /**

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/controller/RmsConsigneeController.java

@@ -41,6 +41,7 @@ public class RmsConsigneeController extends BaseRESTfulController {
             @ApiImplicitParam(name = "consigneeRegisteredAddress", value = "安顺市鑫智成通川区金龙大道119号", required = true, dataType = "String"),
             @ApiImplicitParam(name = "consigneeContactName", value = "李四", required = true, dataType = "String"),
             @ApiImplicitParam(name = "consigneeContactTel", value = "17356241456", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "consigneeCode", value = "12138", required = true, dataType = "String"),
             @ApiImplicitParam(name = "dataStatus", value = "1", required = true, dataType = "Integer"),
     })
     @PostMapping("/operationConsignee")

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

@@ -29,11 +29,14 @@ public class TmsTruckSmsRusultController extends BaseRESTfulController {
     @ApiOperation("value=触发发送短信")
     public boolean addSmsResult(Map<String,Object>map){
             //获取一个个值
-        String AppId= (String) map.get("AppId");
+
+        String AppId= "EUCP-EMY-SMS0-JERSP";
         String timestamp= (String) map.get("timestamp");
         String content= (String) map.get("content");
         String mobiles= (String) map.get("mobiles");
         String sign= (String) map.get("sign");
-            return true;
+
+
+        return true;
     }
 }

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

@@ -35,32 +35,34 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
      * @return
      */
     @ApiModelProperty(value = "接收计量实绩")
-    @ApiOperation(value="接收计量实绩")
+    @ApiOperation(value = "接收计量实绩")
     @ApiParam(name = "orderNumber")
+
     @ApiImplicitParams({
             @ApiImplicitParam(
-                    name = "orderNumber",value = "运输订单号",required = true,dataType = "String"
+                    name = "orderNumber", value = "运输订单号", required = true, dataType = "String"
             ),
             @ApiImplicitParam(
-                    name = "tareCalculateNumber",value = "计皮/计毛汽车衡编号",required = true,dataType = "String"
+                    name = "resultCalculateNumber", value = "计皮/计毛汽车衡编号", required = true, dataType = "String"
             ),
             @ApiImplicitParam(
-                    name = "resultWeight",value = "皮重或者毛重",required = true,dataType = "Double"
+                    name = "resultWeight", value = "皮重或者毛重", required = true, dataType = "Double"
             ),
             @ApiImplicitParam(
-                    name = "resultWeightTime",value = "计皮/计毛时间，毫秒数的时间戳",required = true,dataType = "Long"
+                    name = "resultWeightTime", value = "计皮/计毛时间", required = true, dataType = "String"
             ),
             @ApiImplicitParam(
-                    name = "resultNetWeight",value = "净重",required = true,dataType = "Double"
-            ),@ApiImplicitParam(
-                    name = "resultPoundNo",value = "磅单号",required = true,dataType = "String"
-            ),@ApiImplicitParam(
-                    name = "weightType",value = "计皮/计毛",required = true,dataType = "String"
-            )
+                    name = "resultNetWeight", value = "净重", required = true, dataType = "Double"
+            ), @ApiImplicitParam(
+            name = "resultPoundNo", value = "磅单号", required = true, dataType = "String"
+    ), @ApiImplicitParam(
+            name = "weightType", value = "计皮/计毛", required = true, dataType = "String"
+    )
     }
     )
     @PostMapping("/receiveTmsTruckWeightResult")
-    public RESTfulResult receiveTmsTruckWeightResult(@RequestBody(required = true) Map<String,Object> mapValue) {
+    public RESTfulResult receiveTmsTruckWeightResult(@RequestBody(required = true) Map<String, Object> mapValue) {
+
         int result = tmstruckWeightResultServiceImpl.receiveTmsTruckWeightResult(mapValue);
         return success(result);
     }

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

@@ -0,0 +1,45 @@
+package com.steerinfo.dil.controller;
+
+import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.wsdl.ServiceInfo;
+import com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxyServiceLocator;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 18:12
+ * @Version:V2.0
+ */
+@RestController
+@RequestMapping("/${api.version}/wsface")
+public class WSFaceController extends BaseRESTfulController {
+
+    @PostMapping("/pushBmsSettlement")
+    @ApiModelProperty(value = "结算金蝶访问接口")
+    public String WSFaceWay(@RequestBody Map<String,Object> map) {
+        com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "kduser", "eas", "D001", "L2", 1);
+        WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
+        service.setServername("172.16.62.243" , "56898");
+        String output = null;
+        try {
+            // 这边是map，将map封装后转为json
+            String json = JSONUtils.toJSONString(map);
+            String res = locator.getWSFaceFacade().invokeJson(json);
+            JSONObject request = JSON.parseObject(res);
+            output = request.getString("output");
+            System.out.println(output);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return output;
+    }
+}

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/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/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,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface BmsshipStatementMapper extends IBaseMapper<BmsshipStatement, BigDecimal> {
     // 采购船运账单
-    Map<String, Object> getShipStatement(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);
 
-    List<Map<String, Object>> getOtherMessage(Integer statementId);
+    Map<String,Object> getWaterFeeMembers(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/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/mapper/RmsMaterialTypeMapper.java

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsMaterialType;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,4 +14,7 @@ public interface RmsMaterialTypeMapper extends IBaseMapper<RmsMaterialType, BigD
 
     @Override
     List<RmsMaterialType> selectByParameters(Map<String, Object> parameters);
+
+    @Select("select seq__RMS_MATERIAL_TYPE.nextval from dual")
+    BigDecimal getMaterialId();
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.RmsUnitOfMeasure;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -13,4 +14,7 @@ public interface RmsUnitOfMeasureMapper extends IBaseMapper<RmsUnitOfMeasure, Bi
 
     @Override
     List<RmsUnitOfMeasure> selectByParameters(Map<String, Object> parameters);
+
+    @Select("select seq__RMS_UNIT_MEASURE.nextval from dual")
+    BigDecimal getUnitOfMeasureId();
 }

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

@@ -22,4 +22,10 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     int updateWzInputId(String wzInputId);
 
+    BigDecimal getWeightTaskResultId(String orderNumber);
+
+    Integer updateTruckWeightResult(Map<String, Object> mapValue);
+
+    Integer updateTruckWeightResultGross(Map<String, Object> mapValue);
+
 }

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/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/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/model/RmsConsignee.java

@@ -63,7 +63,7 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
     private String consigneeWarrantyWeight;
 
     /**
-     * 联系电话(CONSIGNEE_CONTACT_TEL,CHAR,10)
+     * 联系电话(CONSIGNEE_CONTACT_TEL,VARCHAR,20)
      */
     @ApiModelProperty(value="联系电话",required=false)
     private String consigneeContactTel;
@@ -116,7 +116,13 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="金蝶收获客户主键ID",required=false)
     private String easConsigneeId;
 
-    private static final Long serialVersionUID = 1L;
+    /**
+     * 收货客户编码(CONSIGNEE_CODE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="收货客户编码",required=false)
+    private String consigneeCode;
+
+    private static final long serialVersionUID = 1L;
 
     @Override
     public BigDecimal getId() {
@@ -272,6 +278,14 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
         this.easConsigneeId = easConsigneeId == null ? null : easConsigneeId.trim();
     }
 
+    public String getConsigneeCode() {
+        return consigneeCode;
+    }
+
+    public void setConsigneeCode(String consigneeCode) {
+        this.consigneeCode = consigneeCode == null ? null : consigneeCode.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -296,6 +310,7 @@ public class RmsConsignee implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
         sb.append(", easConsigneeId=").append(easConsigneeId);
+        sb.append(", consigneeCode=").append(consigneeCode);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -37,7 +37,7 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
      * 包装类型(MATERIAL_PACKING_TYPE,VARCHAR,20)
      */
     @ApiModelProperty(value="包装类型",required=false)
-    private String materialPackingType;
+    private BigDecimal materialTypeStatus;
 
     /**
      * 记录创建人(INSERT_USERNAME,VARCHAR,20)
@@ -113,12 +113,12 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         this.materialOrder = materialOrder;
     }
 
-    public String getMaterialPackingType() {
-        return materialPackingType;
+    public BigDecimal getmaterialTypeStatus() {
+        return materialTypeStatus;
     }
 
-    public void setMaterialPackingType(String materialPackingType) {
-        this.materialPackingType = materialPackingType == null ? null : materialPackingType.trim();
+    public void setmaterialTypeStatus(BigDecimal materialTypeStatus) {
+        this.materialTypeStatus = materialTypeStatus;
     }
 
     public String getInsertUsername() {
@@ -171,7 +171,7 @@ public class RmsMaterialType implements IBasePO<BigDecimal> {
         sb.append(", materialTypeName=").append(materialTypeName);
         sb.append(", materialUnit=").append(materialUnit);
         sb.append(", materialOrder=").append(materialOrder);
-        sb.append(", materialPackingType=").append(materialPackingType);
+        sb.append(", materialTypeStatus=").append(materialTypeStatus);
         sb.append(", insertUsername=").append(insertUsername);
         sb.append(", insertTime=").append(insertTime);
         sb.append(", updateUsername=").append(updateUsername);

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,12 +1,17 @@
 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.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -30,12 +35,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,9 +57,26 @@ 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");
 //        // 得到发货单位
@@ -65,22 +90,33 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         // 得到订货数量
         String purchaseOrderMaterialNumber = (String) mapVal.get("purchaseOrderMaterialNumber");
         // 得到订单日期
-        Date purchaseOrderDate = new Date((Long) mapVal.get("purchaseOrderDate"));
+        String purchaseOrderDateStr = (String) mapVal.get("purchaseOrderDate");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        AmsPurchaseOrder amsPurchaseOrder = new AmsPurchaseOrder();
+        try {
+            Date purchaseOrderDate = sdf.parse(purchaseOrderDateStr);
+            amsPurchaseOrder.setPurchaseOrderDate(purchaseOrderDate);
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
         // 得到供应商代码
         String supplierDutyParagraph = (String) mapVal.get("supplierDutyParagraph");
         BigDecimal supplierId = amsPurchaseOrderMapper.getSupplierId(supplierDutyParagraph);
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
-        AmsPurchaseOrder amsPurchaseOrder = new AmsPurchaseOrder();
         amsPurchaseOrder.setPurchaseOrderNo(purchaseOrderNo);
         amsPurchaseOrder.setPurchaseOrderBuyer(purchaseOrderBuyer);
-        amsPurchaseOrder.setPurchaseOrderDate(purchaseOrderDate);
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
         amsPurchaseOrder.setBatchId(batchId);
         amsPurchaseOrder.setSupplierUnitId(supplierId);
         amsPurchaseOrder.setReceiveUnitId(shipperId);
         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

@@ -1,8 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import com.steerinfo.dil.model.BmsportHandlingFee;
 import com.steerinfo.dil.mapper.BmsportHandlingFeeMapper;
 import com.steerinfo.dil.service.IBmsportHandlingFeeService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,25 +36,33 @@ public class BmsportHandlingFeeServiceImpl implements IBmsportHandlingFeeService
      */
     @Override
     public Map<String, Object> getPortFee(Integer feeId) {
-        List<Map<String, Object>> mapList = bmsportHandlingFeeMapper.getPortFee(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> mapValue = new HashMap<>();
-        Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(feeId);
-        mapValue.put("mapList",mapList);
-        mapValue.put("statementTotalAmount",statementTotalAmount);
-        mapValue.put("statementTime",statementTime);
-        mapValue.put("statementNo","");
+        Map<String, Object> map = entries.get(0);
+        BigDecimal statementTotalAmount = (BigDecimal) map.get("amount");
+        BigDecimal qty = (BigDecimal) map.get("qty");
+        map.remove("amount");
+        map.remove("qty");
+        map.put("amount",statementTotalAmount.toString());
+        map.put("qty",qty.toString());
+        String detailNum = (String) map.get("detailNum");
+        Date statementTime = (Date) map.get("detailDate");
+        Map<String,Object> head = new HashMap<>();
+        Map<String,Object> otherMap = bmsportHandlingFeeMapper.getOtherMessage(new BigDecimal(feeId));
+        head.put("allAmount",statementTotalAmount.toString());
+        head.put("bizDate",statementTime);
+        head.put("billNum",detailNum);
         String amountType = "港口装卸费";
-        mapValue.put("amountType",amountType);
-        mapValue.put("collectionName","");
-        mapValue.putAll(otherMap);
-        return mapValue;
+        head.put("amountType",amountType);
+        head.put("payUnitNum","");
+        head.put("receivedUnitNum","");
+        head.putAll(otherMap);
+        Map<String,Object> input = new HashMap<>();
+        input.put("entries",entries);
+        input.put("head",head);
+        return input;
     }
 }

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);
-        return mapList;
+        List<Map<String,Object>> entries = bmsshipDetailsOrderMapper.getPurchaseShipDetails(new BigDecimal(statementId));
+        return entries;
     }
 }

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

@@ -4,11 +4,16 @@ 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.ArrayList;
+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 +22,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：BmsshipStatement服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "bmsshipStatementService")
 public class BmsshipStatementServiceImpl implements IBmsshipStatementService {
@@ -28,15 +33,61 @@ 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);
-        mapValue.putAll(map);
-        return mapValue;
+        Map<String, Object> head = bmsshipStatementMapper.getShipStatement(new BigDecimal(statementId));
+        List<Map<String, Object>> mapList = bmsshipStatementMapper.getShipOtherMessage(new BigDecimal(statementId));
+        String amountType = (String) head.get("amountType");
+        // 详单
+        List<Map<String,Object>> entries = new ArrayList<>();
+        Map<String,Object> input = new HashMap<>();
+        Map<String,Object> detailsMap = new HashMap<>();
+        detailsMap.put("detailNum","");
+        detailsMap.put("detailDate","");
+        detailsMap.put("carNum","");
+        detailsMap.put("startingPoint","");
+        detailsMap.put("endPoint","");
+        detailsMap.put("qty","");
+        detailsMap.put("forwarder","");
+        detailsMap.put("matNum","");
+        detailsMap.put("matName","");
+        entries.add(detailsMap);
+        Map<String, Object> map = new HashMap<>();
+        if (amountType.equals("水运费")) {
+            // 发货单位和收款单位
+            Map<String, Object> shipMap = mapList.get(0);
+            // 付款单位
+            String payUnitName = bmsshipStatementMapper.getShipPaymentUnit(new BigDecimal(statementId));
+            map.putAll(shipMap);
+            map.put("payUnitName",payUnitName);
+            map.put("payUnitNum","");
+            map.put("receivedUnitNum","");
+            map.put("collectionUnitNum","");
+        }
+        if (amountType.equals("物流途损超标扣款")) {
+            // 付款单位，发货单位，收款单位
+            Map<String,Object> lossMap = bmsshipStatementMapper.getLossPaymentUnit(new BigDecimal(statementId));
+            map.put("collectionUnitNum","");
+            map.put("receivedUnitNum","");
+            map.put("payUnitNum","");
+            map.putAll(lossMap);
+            input.put("entries",entries);
+        }
+        if (amountType.equals("水分检测费")) {
+            Map<String,Object> waterMap = bmsshipStatementMapper.getWaterFeeMembers(new BigDecimal(statementId));
+            map.put("collectionUnitName","");
+            map.put("payUnitNum","");
+            map.put("collectionUnitNum","");
+            map.put("receivedUnitNum","");
+            map.putAll(waterMap);
+            input.put("entries",entries);
+        }
+        head.putAll(map);
+        input.put("head",head);
+        return input;
     }
 }

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

@@ -33,22 +33,22 @@ 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));
-        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);
+    public List<Map<String, Object>> getPurchaseTrainDetailsOrder(Integer statementId) {
+        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

@@ -38,15 +38,18 @@ public class BmstrainStatementServiceImpl implements IBmstrainStatementService {
      */
     @Override
     public Map<String, Object> getTrainStatement(Integer statementId) {
-        Map<String, Object> mapValue = bmstrainStatementMapper.getTrainStatement(new BigDecimal(statementId));
+        Map<String, Object> head = bmstrainStatementMapper.getTrainStatement(new BigDecimal(statementId));
         List<Map<String,Object>> mapList = bmstrainStatementMapper.getCarrierAndReceiver(new BigDecimal(statementId));
         Map<String, Object> map = mapList.get(0);
         String amountType = "采购火运";
-        String collectionName = "成都铁路局";
-        mapValue.put("amountType",amountType);
-        mapValue.put("collectionName",collectionName);
-        mapValue.putAll(map);
-        return mapValue;
+        String collectionUnitName = "成都铁路局";
+        head.put("amountType",amountType);
+        head.put("payUnitNum","");
+        head.put("receivedUnitNum","");
+        head.put("collectionUnitNum","");
+        head.put("collectionUnitName",collectionUnitName);
+        head.putAll(map);
+        return head;
     }
 
     /**

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

@@ -37,23 +37,30 @@ 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));
         String amountType = "采购汽运";
-        Map<String,Object> map = new HashMap<>();
-        String statementNumber = "";
-        Date statementTime = (Date) (mapList.get(0).get("detailsTime"));
-        BigDecimal detailsAmount = (BigDecimal) (mapList.get(0).get("detailsAmount"));
-        Double statementExcludTax = detailsAmount.doubleValue();
-        Map<String,Object> statementMap = bmstruckDetailsOrderMapper.getStatementMessage(detailsId);
-        map.put("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> head = new HashMap<>();
+        String billNum = (String) (entries.get(0).get("detailNum"));
+        Date bizDate = (Date) (entries.get(0).get("detailDate"));
+        BigDecimal amount = (BigDecimal) (entries.get(0).get("amount"));
+        BigDecimal qty = (BigDecimal) (entries.get(0).get("qty"));
+        entries.get(0).remove("amount");
+        entries.get(0).remove("qty");
+        entries.get(0).put("amount",amount.toString());
+        entries.get(0).put("qty",qty.toString());
+        String statementExcludTax = amount.toString();
+        Map<String,Object> statementMap = bmstruckDetailsOrderMapper.getStatementMessage(new BigDecimal(detailsId));
+        head.put("billNum",billNum);
+        head.put("bizDate",bizDate);
+        head.put("amountType",amountType);
+        head.put("allAmount",statementExcludTax);
+        head.put("receivedUnitNum","");
+        head.put("payUnitNum","");
+        head.putAll(statementMap);
+        Map<String,Object> input = new HashMap<>();
+        input.put("head",head);
+        input.put("entries",entries);
+        return input;
     }
 
     /**
@@ -63,7 +70,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,10 +1,12 @@
 package com.steerinfo.dil.service.impl;
 
-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;
 
@@ -26,6 +28,14 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
 
     @Autowired
     private BmstruckStatementMapper bmstruckStatementMapper;
+    @Autowired
+    BmstrainStatementMapper bmstrainStatementMapper;
+    @Autowired
+    BmsshipStatementMapper bmsshipStatementMapper;
+    @Autowired
+    BmstruckDetailsOrderMapper bmstruckDetailsOrderMapper;
+    @Autowired
+    BmsportHandlingFeeMapper bmsportHandlingFeeMapper;
 
     /**
      * 得到汽运账单
@@ -34,26 +44,84 @@ public class BmstruckStatementServiceImpl implements IBmstruckStatementService {
      */
     @Override
     public Map<String, Object> getStatement(Integer statementId) {
-        Map<String,Object> mapValue = bmstruckStatementMapper.getStatement(new BigDecimal(statementId));
+        Map<String,Object> head = bmstruckStatementMapper.getStatement(new BigDecimal(statementId));
         List<Map<String,Object>> mapList = bmstruckStatementMapper.getCarrierAndReceiver(new BigDecimal(statementId));
         String amountType = "销售汽运";
-        mapValue.put("amountType",amountType);
+        head.put("amountType",amountType);
         Map<String, Object> map = mapList.get(0);
-        mapValue.putAll(map);
-        return mapValue;
+        head.putAll(map);
+        head.put("payUnitNum","");
+        head.put("forwordUnitNum","");
+        head.put("collectionUnitNum","");
+        return head;
     }
 
     /**
      * 修改账单信息
-     * @param mapValue
+     * @param head
      * @return
      */
     @Override
-    public int updateStatement(Map<String, Object> mapValue) {
-        String statementNumber = (String) mapValue.get("statementNumber");
-        List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) mapValue.get("detailsNumberList");
-        Double amount = (Double) mapValue.get("amount");
-        String remark = (String) mapValue.get("remark");
-        return 0;
+    public int updateStatement(Map<String, Object> head) {
+        int result = 0;
+        Map<String,Object> parametersMap = new HashMap<>();
+        String statementNumber = (String) head.get("statementNumber");
+        List<Map<String,Object>> detailsNumberList = (List<Map<String, Object>>) head.get("mapList");
+        String amount = (String) head.get("amount");
+        String remark = (String) head.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("")){
+
+        }
+        return result;
     }
 }

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/service/impl/RmsConsigneeServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.IRmsConsigneeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +49,8 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         String consigneeContactName = (String) mapVal.get("consigneeContactName");
         // 得到联系电话
         String consigneeContactTel = (String) mapVal.get("consigneeContactTel");
+        // 得到客户编码
+        String consigneeCode = (String) mapVal.get("consigneeCode");
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
         // 判断是否EASId已存在
@@ -62,6 +65,12 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         rmsConsignee.setConsigneeRegisteredAddress(consigneeRegisteredAddress);
         rmsConsignee.setConsigneeContactName(consigneeContactName);
         rmsConsignee.setConsigneeContactTel(consigneeContactTel);
+        rmsConsignee.setConsigneeCode(consigneeCode);
+        rmsConsignee.setInsertTime(new Date());
+        rmsConsignee.setInsertUsername("admin");
+        rmsConsignee.setUpdateTime(new Date());
+        rmsConsignee.setUpdateUsername("admin");
+        rmsConsignee.setInsertUpdateRemark("无");
         int result = 0;
         List<RmsConsignee> rmsRmsConsignees = rmsConsigneeMapper.selectByParameters(map);
         // 新增

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,7 +51,7 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         // 得到物资唯一编码
         String materialCode = (String) mapVal.get("materialCode");
         // 得到物资类型
-        String materialType = (String) mapVal.get("materialType");
+        String materialTypeName = (String) mapVal.get("materialType");
         // 得到物资名称
         String materialName = (String) mapVal.get("materialName");
         // 得到物资规格
@@ -61,7 +62,10 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         String unitOfMeasure = (String) mapVal.get("unitOfMeasure");
         // 得到长度
         String materialLengthValue = (String) mapVal.get("materialLength");
-        BigDecimal materialLength = new BigDecimal(materialLengthValue);
+        BigDecimal materialLength = null;
+        if (materialLengthValue != null && !materialLengthValue.equals("")) {
+            materialLength = new BigDecimal(materialLengthValue);
+        }
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
         // 判断是否EASId已存在
@@ -72,23 +76,56 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);
         // 判断物资类型是否已存在
         Map<String,Object> map2 = new HashMap<>();
-        map2.put("materialType",materialType);
+        map2.put("materialTypeName",materialTypeName);
         List<RmsMaterialType> rmsMaterialTypes = rmsMaterialTypeMapper.selectByParameters(map2);
-        RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
+        RmsMaterial rmsMaterial = new RmsMaterial();
+        if (rmsMaterialTypes.size() == 0) {
+            RmsMaterialType rmsMaterialType = new RmsMaterialType();
+            rmsMaterialType.setMaterialTypeId(rmsMaterialTypeMapper.getMaterialId());
+            rmsMaterialType.setMaterialTypeName(materialTypeName);
+            rmsMaterialType.setInsertTime(new Date());
+            rmsMaterialType.setInsertUsername("admin");
+            rmsMaterialType.setUpdateTime(new Date());
+            rmsMaterialType.setUpdateUsername("admin");
+            rmsMaterialType.setInsertUpdateRemark("采集金蝶数据");
+            rmsMaterialTypeMapper.insertSelective(rmsMaterialType);
+            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+        }
+        else {
+            RmsMaterialType rmsMaterialType = rmsMaterialTypes.get(0);
+            rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
+        }
         // 判断单位是否已存在
         Map<String,Object> map3 = new HashMap<>();
-        map3.put("unitOfMeasure",unitOfMeasure);
+        map3.put("unitOfMeasureName",unitOfMeasure);
         List<RmsUnitOfMeasure> rmsUnitOfMeasures = rmsUnitOfMeasureMapper.selectByParameters(map3);
-        RmsUnitOfMeasure rmsUnitOfMeasure = rmsUnitOfMeasures.get(0);
-        RmsMaterial rmsMaterial = new RmsMaterial();
+        if (rmsUnitOfMeasures.size() == 0) {
+            RmsUnitOfMeasure rmsUnitOfMeasure = new RmsUnitOfMeasure();
+            rmsUnitOfMeasure.setUnitOfMeasureId(rmsUnitOfMeasureMapper.getUnitOfMeasureId());
+            rmsUnitOfMeasure.setUnitOfMeasureName(unitOfMeasure);
+            rmsUnitOfMeasure.setInsertTime(new Date());
+            rmsUnitOfMeasure.setInsertUsername("admin");
+            rmsUnitOfMeasure.setUpdateTime(new Date());
+            rmsUnitOfMeasure.setUpdateUsername("admin");
+            rmsUnitOfMeasure.setInsertUpdateRemark("采集金蝶数据");
+            rmsUnitOfMeasureMapper.insertSelective(rmsUnitOfMeasure);
+            rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        }
+        else {
+            RmsUnitOfMeasure rmsUnitOfMeasure = rmsUnitOfMeasures.get(0);
+            rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        }
         rmsMaterial.setMaterialName(materialName);
         rmsMaterial.setMaterialCode(materialCode);
         rmsMaterial.setMaterialSpecification(materialSpecification);
         rmsMaterial.setMaterialModel(materialModel);
         rmsMaterial.setMaterialLength(materialLength);
         rmsMaterial.setEasMaterialId(EASMaterialId);
-        rmsMaterial.setMaterialTypeId(rmsMaterialType.getMaterialTypeId());
-        rmsMaterial.setUnitOfMeasureId(rmsUnitOfMeasure.getUnitOfMeasureId());
+        rmsMaterial.setInsertTime(new Date());
+        rmsMaterial.setInsertUsername("admin");
+        rmsMaterial.setUpdateTime(new Date());
+        rmsMaterial.setUpdateUsername("admin");
+        rmsMaterial.setInsertUpdateRemark("采集金蝶数据");
         int result = 0;
         // 新增
         if (rmsMaterials.size() == 0) {

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -67,6 +68,11 @@ public class RmsSupplierServiceImpl implements IRmsSupplierService {
         rmsSupplier.setSupplierAddress(supplierAddress);
         rmsSupplier.setSupplierContactsName(supplierContactsName);
         rmsSupplier.setSupplierContactNumber(supplierContactNumber);
+        rmsSupplier.setInsertTime(new Date());
+        rmsSupplier.setInsertUsername("admin");
+        rmsSupplier.setUpdateTime(new Date());
+        rmsSupplier.setUpdateUsername("admin");
+        rmsSupplier.setInsertUpdateRemark("无");
         int result = 0;
         // 新增
         if (rmsSuppliers.size() == 0) {

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

@@ -9,4 +9,5 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TmsTruckSmsRusultService implements ITmsTruckSmsRusultService {
+
 }

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

@@ -3,10 +3,12 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
+import io.swagger.annotations.ApiModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -35,46 +37,59 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      */
     @Override
     public int receiveTmsTruckWeightResult(Map<String, Object> mapValue) {
+
         // 得到运输订单号
-//        String orderNumber = (String) mapValue.get("orderNumber");
-        BigDecimal weightTaskResultId = tmstruckWeightResultMapper.getWeightTaskResultId(mapValue);
-        TmstruckWeightResult tmstruckWeightResult =tmstruckWeightResultMapper.selectByPrimaryKey(weightTaskResultId);
+        String orderNumber = (String) mapValue.get("orderNumber");
         String weightType=(String)mapValue.get("weightType");
+        String calculateNumber = (String) mapValue.get("resultCalculateNumber");
+//        // 得到重量
+//        String resultWeight = (String) mapValue.get("resultWeight");
+        // 得到计皮时间
+//        Date resultWeightTime = new Date((Long) mapValue.get("resultWeightTime"));
+        // 得到计皮汽车衡id
+        BigDecimal resultTarePlaceId = tmstruckWeightResultMapper.getTruckCalculateId(calculateNumber);
         if (weightType.equals("计皮")){
-            // 得到计皮汽车衡编号
-            String calculateNumber = (String) mapValue.get("calculateNumber");
-            BigDecimal resultTarePlaceId = tmstruckWeightResultMapper.getTruckCalculateId(calculateNumber);
-            // 得到皮重
-            String resultWeight = (String) mapValue.get("resultWeight");
-            // 得到计皮时间
-            Date resultWeightTime = new Date((Long) mapValue.get("resultWeightTime"));
-            // 得到净重
-            String resultNetWeight = (String)mapValue.get("resultNetWeight");
-            String resultPoundNo=(String) mapValue.get("resultPoundNo");
-            tmstruckWeightResult.setResultPoundNo(resultPoundNo);
-            tmstruckWeightResult.setResultTarePlaceId(resultTarePlaceId);
-            tmstruckWeightResult.setResultTareWeight(new BigDecimal(resultWeight));
-            tmstruckWeightResult.setResultTareWeightTime(resultWeightTime);
-            tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+//            Map<String, Object> map = new HashMap<>();
+//            mapValue.put("orderNumber",resultTarePlaceId);
+            mapValue.put("resultTarePlaceId",resultTarePlaceId);
+            return  tmstruckWeightResultMapper.updateTruckWeightResult(mapValue);
         }
         if (weightType.equals("计毛")){
-            // 得到计毛汽车衡编号
-            String calculateNumber = (String) mapValue.get("calculateNumber");
-            // 得到毛重
-            String resultWeight = (String) mapValue.get("resultWeight");
-            // 得到计毛时间
-            Date resultWeightTime = new Date((Long) mapValue.get("resultWeightTime"));
-            BigDecimal resultGrossPlaceId = tmstruckWeightResultMapper.getTruckCalculateId(calculateNumber);
-            String resultPoundNo=(String) mapValue.get("resultPoundNo");
-            tmstruckWeightResult.setResultPoundNo(resultPoundNo);
-            tmstruckWeightResult.setResultGrossPlaceId(resultGrossPlaceId);
-            tmstruckWeightResult.setResultGrossWeight(new BigDecimal(resultWeight));
-            tmstruckWeightResult.setResultGrossWeightTime(resultWeightTime);
-            // 得到净重
-            String resultNetWeight = (String) mapValue.get("resultNetWeight");
-            tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+            mapValue.put("resultTarePlaceId",resultTarePlaceId);
+            return tmstruckWeightResultMapper.updateTruckWeightResultGross(mapValue);
         }
-        int result = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
-        return result;
+        return 1;
+
+//        BigDecimal weightTaskResultId = tmstruckWeightResultMapper.getWeightTaskResultId(mapValue);
+//        TmstruckWeightResult tmstruckWeightResult =tmstruckWeightResultMapper.selectByPrimaryKey(weightTaskResultId);
+//        if (weightType.equals("计皮")){
+//            // 得到净重
+//            String resultNetWeight = (String)mapValue.get("resultNetWeight");
+//            String resultPoundNo=(String) mapValue.get("resultPoundNo");
+//            tmstruckWeightResult.setResultPoundNo(resultPoundNo);
+//            tmstruckWeightResult.setResultTarePlaceId(resultTarePlaceId);
+//            tmstruckWeightResult.setResultTareWeight(new BigDecimal(resultWeight));
+//            tmstruckWeightResult.setResultTareWeightTime(resultWeightTime);
+//            tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+//        }
+//        if (weightType.equals("计毛")){
+////            // 得到计毛汽车衡编号
+////            String calculateNumber = (String) mapValue.get("calculateNumber");
+////            // 得到毛重
+////            String resultWeight = (String) mapValue.get("resultWeight");
+////            // 得到计毛时间
+////            Date resultWeightTime = new Date((Long) mapValue.get("resultWeightTime"));
+//            BigDecimal resultGrossPlaceId = tmstruckWeightResultMapper.getTruckCalculateId(calculateNumber);
+//            String resultPoundNo=(String) mapValue.get("resultPoundNo");
+//            tmstruckWeightResult.setResultPoundNo(resultPoundNo);
+//            tmstruckWeightResult.setResultGrossPlaceId(resultGrossPlaceId);
+//            tmstruckWeightResult.setResultGrossWeight(new BigDecimal(resultWeight));
+//            tmstruckWeightResult.setResultGrossWeightTime(resultWeightTime);
+//            // 得到净重
+//            String resultNetWeight = (String) mapValue.get("resultNetWeight");
+//            tmstruckWeightResult.setResultNetWeight(new BigDecimal(resultNetWeight));
+//        }
+//        int result = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+//        return result;
     }
 }

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

@@ -0,0 +1,69 @@
+package com.steerinfo.dil.util;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+public class EASUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "kduser";
+    public final String dcName = "D001";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "savePayOtherBill";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

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

@@ -0,0 +1,111 @@
+package com.steerinfo.dil.wsdl;
+
+import java.io.Serializable;
+
+/**
+ * Description: weather1
+ * Created by ydx on 2018/8/13 13:39
+ */
+public class ServiceInfo implements Serializable{
+    private String userName;    // 用户名
+    private String password;    // 密码
+    private String slnName;     // eas
+    private String dcName;      // 数据中心
+    private String language;    // 语言
+    private int dbType;         // 数据库类型
+    private String authPattern; // 验证方式
+    private String servername;
+
+    public String getServername () {
+        return servername;
+    }
+
+    public void setServername (String ip, String port) {
+        this.servername = "http://"+ip+":"+port+"/ormrpc/services/";
+    }
+
+    public ServiceInfo(String userName, String password, String slnName, String dcName, String language, int dbType, String authPattern) {
+        this.userName = userName;
+        this.password = password;
+        this.slnName = slnName;
+        this.dcName = dcName;
+        this.language = language;
+        this.dbType = dbType;
+        this.authPattern = authPattern;
+    }
+
+    public ServiceInfo() {
+
+    }
+
+    public ServiceInfo(String userName, String password, String slnName, String dcName, String language, int dbType) {
+
+        this.userName = userName;
+        this.password = password;
+        this.slnName = slnName;
+        this.dcName = dcName;
+        this.language = language;
+        this.dbType = dbType;
+    }
+
+    public String getUserName () {
+
+        return userName;
+    }
+
+    public void setUserName (String userName) {
+        this.userName = userName;
+    }
+
+    public String getPassword () {
+        return password;
+    }
+
+    public void setPassword (String password) {
+        this.password = password;
+    }
+
+    public String getSlnName () {
+        return slnName;
+    }
+
+    public void setSlnName (String slnName) {
+        this.slnName = slnName;
+    }
+
+    public String getDcName () {
+        return dcName;
+    }
+
+    public void setDcName (String dcName) {
+        this.dcName = dcName;
+    }
+
+    public String getLanguage () {
+        return language;
+    }
+
+    public void setLanguage (String language) {
+        this.language = language;
+    }
+
+    public int getDbType () {
+        return dbType;
+    }
+
+    public void setDbType (int dbType) {
+        this.dbType = dbType;
+    }
+
+    public String getAuthPattern () {
+        return authPattern;
+    }
+
+    public void setAuthPattern (String authPattern) {
+        this.authPattern = authPattern;
+    }
+
+    public void setServername (String servername) {
+        this.servername = servername;
+    }
+}

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

@@ -0,0 +1,115 @@
+package com.steerinfo.dil.wsdl;
+
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.wsdl.ServiceInfo;
+import com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxyServiceLocator;
+
+
+public class TestDG {
+    public static void main(String args[]) {
+//        要先登陆EAS才能调用后续接口，登录传递参数说明如下：
+//        String userName	//EAS登录用户名，可以是user或其他有效的用户名
+//        String password	//EAS用户登录密码
+//        String slnName	//eas
+//        String dcName	//注册的数据中心名称
+//        String language	//登录的语言
+//        Int32 dbType	//数据类型，0：MSSQL，1：ORACLE
+        //ServiceInfo service = new ServiceInfo("user", "lth3690", "eas", "A005", "L2", 1);
+        //ServiceInfo service = new ServiceInfo("01514","321","eas","EAS1101","l2",1);
+        //ServiceInfo service = new ServiceInfo("user", "kduser", "eas", "CSTO_UAT", "L2", 0);
+//        ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
+//        ServiceInfo service = new ServiceInfo("user", "lth3690", "eas", "A001", "L2", 1);
+        //ServiceInfo service = new ServiceInfo("user", "user2019", "eas", "EASTEST", "L2", 1);
+//        ServiceInfo service = new ServiceInfo("user", "kduser", "eas", "D001", "L2", 1);
+        //service.setServername("172.16.62.243","56898");//地址和端口号
+        //service.setServername("10.99.0.2","56898");//地址和端口号
+//        service.setServername("10.192.200.28","56898");//地址和端口号
+        //service.setServername("125.68.188.158","6888");//地址和端口号
+        //service.setServername("10.192.106.5","6888");//地址和端口号
+        //service.setServername("10.192.200.28" , "56898");
+        //service.setServername("192.168.55.110" , "56898");
+        //service.setServername("127.0.0.1" , "56898");
+//        service.setServername("172.16.62.243" , "56898");
+//        service.setServername("172.16.33.111" , "8900");
+//        service.setServername("172.16.62.243" , "56898");
+//        ServiceInfo service = new ServiceInfo("黄英", "123", "eas", "NT11", "L2", 1);
+//        service.setServername("172.16.200.57" , "6888");
+        com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "kduser", "eas", "D001", "L2", 1);
+        service.setServername("172.16.62.243" , "56898");
+        long startT = System.currentTimeMillis();
+        try {
+            String result = null;
+            WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
+            // 这边是map，将map封装后转为json
+            String json ="{\n" +
+                    "\n" +
+                    "\t\"input\": {\n" +
+                    "\t\t\"head\": {\n" +
+                    "\t\t\t\"billNum\": \"9999999\",\n" +
+                    "\t\t\t\"bizDate\": \"2021-11-15\",\n" +
+                    "\t\t\t\"payUnitNum\": \"\",\n" +
+                    "\t\t\t\"payUnitName\": \"\",\n" +
+                    "\t\t\t\"forwordUnitNum\": \"DG001\",\n" +
+                    "\t\t\t\"forwordUnitName\": \"四川省达州钢铁集团有限责任公司\",\n" +
+                    "\t\t\t\"collectionUnitNum\": \"010300304\",\n" +
+                    "\t\t\t\"collectionUnitName\": \"010300304\",\n" +
+                    "\t\t\t\"receivedUnitNum\": \"\",\n" +
+                    "\t\t\t\"receivedUnitName\": \"\",\n" +
+                    "\t\t\t\"allAmount\": 11111\n" +
+                    "\t\t},\n" +
+                    "\t\t\"entries\": [{\n" +
+                    "\t\t\t\t\"detailNum\": \"111\",\n" +
+                    "\t\t\t\t\"detailDate\": \"2021-11-15\",\n" +
+                    "\t\t\t\t\"carNum\": \"001\",\n" +
+                    "\t\t\t\t\"startingPoint\": \"成都\",\n" +
+                    "\t\t\t\t\"endPoint\": \"达州\",\n" +
+                    "\t\t\t\t\"qty\": \"1\",\n" +
+                    "\t\t\t\t\"amount\": \"100\",\n" +
+                    "\t\t\t\t\"forwarder\": \"自提\",\n" +
+                    "\t\t\t\t\"matNum\": \"0101020300002\",\n" +
+                    "\t\t\t\t\"matName\": \"伊朗铁精粉\"\n" +
+                    "\t\t\t},\n" +
+                    "\t\t\t{\n" +
+                    "\t\t\t\t\"detailNum\": \"222\",\n" +
+                    "\t\t\t\t\"detailDate\": \"2021-11-15\",\n" +
+                    "\t\t\t\t\"carNum\": \"002\",\n" +
+                    "\t\t\t\t\"startingPoint\": \"成都\",\n" +
+                    "\t\t\t\t\"endPoint\": \"绵阳\",\n" +
+                    "\t\t\t\t\"qty\": \"2\",\n" +
+                    "\t\t\t\t\"amount\": \"200\",\n" +
+                    "\t\t\t\t\"forwarder\": \"达运\",\n" +
+                    "\t\t\t\t\"matNum\": \"0101020400001\",\n" +
+                    "\t\t\t\t\"matName\": \"巴西球团矿\"\n" +
+                    "\t\t\t}\n" +
+                    "\n" +
+                    "\t\t]\n" +
+                    "\t},\n" +
+                    "\t\"context\": {\n" +
+                    "\t\t\"logError\": true,\n" +
+                    "\t\t\"logData\": true\n" +
+                    "\t},\n" +
+                    "\t\"login\": {\n" +
+                    "\t\t\"password\": \"kduser\",\n" +
+                    "\t\t\"dcName\": \"D001\",\n" +
+                    "\t\t\"dbType\": \"0\",\n" +
+                    "\t\t\"userName\": \"user\"\n" +
+                    "\t},\n" +
+                    "\t\"command\": \"savePayOtherBill\"\n" +
+                    "\n" +
+                    "}";
+            String res = locator.getWSFaceFacade().invokeJson(json);
+            JSONObject request = JSON.parseObject(res);
+            String output = request.getString("output");
+            System.out.println(output);
+//            String outResult = FaceEncryptUtil.AES_Decrypt(output, "FXXT");
+//            System.out.println(res);//调用接口后返回的结果数据
+//            System.out.println(outResult);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

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

@@ -0,0 +1,48 @@
+package com.steerinfo.dil.wsdl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.util.EASUtil;
+import org.apache.poi.ss.formula.functions.T;
+
+import java.util.Map;
+import java.util.Scanner;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:54
+ * @Version:V2.0
+ */
+public class TestEasUtil {
+
+    public static void main(String[] args) {
+        TestEasUtil test = new TestEasUtil();
+        EASUtil easUtil = new EASUtil();
+        System.out.println(easUtil.getTotalMap());
+        System.out.println(String.class);
+        test.pleaseAsk();
+        System.out.println("罗棒：");
+        Scanner sc = new Scanner(System.in);
+        int i = sc.nextInt();
+        String answer = test.pleaseAnswer(i);
+        System.out.println(answer);
+        System.out.println("小峰：为什么？");
+        String reason = sc.next();
+        System.out.println("小峰：呜呜呜~");
+    }
+
+    public void pleaseAsk() {
+        System.out.println("小峰：请问你爱我吗？");
+    }
+
+    public String pleaseAnswer(int answer) {
+        String name = "罗棒：";
+        if (answer == 520) {
+            return name + "我爱你";
+        }
+        else {
+            return name + "我不爱你";
+        }
+    }
+}

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

@@ -0,0 +1,585 @@
+/**
+ * WSFaceFacadeSoapBindingStub.java
+ *
+ * This file was auto-generated from com.steerinfo.dil.wsdl
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) com.steerinfo.dil.wsdl2Java emitter.
+ */
+
+package com.steerinfo.dil.wsdl;
+
+
+
+public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub implements com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy {
+    private java.util.Vector cachedSerClasses = new java.util.Vector();
+    private java.util.Vector cachedSerQNames = new java.util.Vector();
+    private java.util.Vector cachedSerFactories = new java.util.Vector();
+    private java.util.Vector cachedDeserFactories = new java.util.Vector();
+
+    static org.apache.axis.description.OperationDesc [] _operations;
+
+    static {
+        _operations = new org.apache.axis.description.OperationDesc[8];
+        _initOperationDesc1();
+    }
+
+    private static void _initOperationDesc1(){
+        org.apache.axis.description.OperationDesc oper;
+        org.apache.axis.description.ParameterDesc param;
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("invokeJson");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "strRequest"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "invokeJsonReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[0] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("invokeXML");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "strRequest"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "invokeXMLReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[1] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("thirdJson");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "strRequest"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "thirdJsonReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[2] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("thirdXML");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "strRequest"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "thirdXMLReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[3] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("writeFileJson");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "request"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "fileData"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "writeFileJsonReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[4] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("readFileJson");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "request"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "base64Binary"));
+        oper.setReturnClass(byte[].class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "readFileJsonReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[5] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("writeFileXml");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "request"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "fileData"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"));
+        oper.setReturnClass(String.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "writeFileXmlReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[6] = oper;
+
+        oper = new org.apache.axis.description.OperationDesc();
+        oper.setName("readFileXml");
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "request"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "base64Binary"));
+        oper.setReturnClass(byte[].class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "readFileXmlReturn"));
+        oper.setStyle(org.apache.axis.constants.Style.RPC);
+        oper.setUse(org.apache.axis.constants.Use.ENCODED);
+        oper.addFault(new org.apache.axis.description.FaultDesc(
+                      new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
+                      new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
+                      true
+                     ));
+        _operations[7] = oper;
+
+    }
+
+    public WSFaceFacadeSoapBindingStub() throws org.apache.axis.AxisFault {
+         this(null);
+    }
+
+    public WSFaceFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+         this(service);
+         super.cachedEndpoint = endpointURL;
+    }
+
+    public WSFaceFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+        if (service == null) {
+            super.service = new org.apache.axis.client.Service();
+        } else {
+            super.service = service;
+        }
+        ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.1");
+            Class cls;
+            javax.xml.namespace.QName qName;
+            javax.xml.namespace.QName qName2;
+            Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
+            Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
+            Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
+            Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
+            Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
+            Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
+            Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
+            Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
+            Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
+            Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+            qName = new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException");
+            cachedSerQNames.add(qName);
+            cls = com.steerinfo.dil.wsdl.WSInvokeException.class;
+            cachedSerClasses.add(cls);
+            cachedSerFactories.add(beansf);
+            cachedDeserFactories.add(beandf);
+
+    }
+
+    protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
+        try {
+            org.apache.axis.client.Call _call = super._createCall();
+            if (super.maintainSessionSet) {
+                _call.setMaintainSession(super.maintainSession);
+            }
+            if (super.cachedUsername != null) {
+                _call.setUsername(super.cachedUsername);
+            }
+            if (super.cachedPassword != null) {
+                _call.setPassword(super.cachedPassword);
+            }
+            if (super.cachedEndpoint != null) {
+                _call.setTargetEndpointAddress(super.cachedEndpoint);
+            }
+            if (super.cachedTimeout != null) {
+                _call.setTimeout(super.cachedTimeout);
+            }
+            if (super.cachedPortName != null) {
+                _call.setPortName(super.cachedPortName);
+            }
+            java.util.Enumeration keys = super.cachedProperties.keys();
+            while (keys.hasMoreElements()) {
+                String key = (String) keys.nextElement();
+                _call.setProperty(key, super.cachedProperties.get(key));
+            }
+            // All the type mapping information is registered
+            // when the first call is made.
+            // The type mapping information is actually registered in
+            // the TypeMappingRegistry of the service, which
+            // is the reason why registration is only needed for the first call.
+            synchronized (this) {
+                if (firstCall()) {
+                    // must set encoding style before registering serializers
+                    _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+                    _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);
+                    for (int i = 0; i < cachedSerFactories.size(); ++i) {
+                        Class cls = (Class) cachedSerClasses.get(i);
+                        javax.xml.namespace.QName qName =
+                                (javax.xml.namespace.QName) cachedSerQNames.get(i);
+                        Object x = cachedSerFactories.get(i);
+                        if (x instanceof Class) {
+                            Class sf = (Class)
+                                 cachedSerFactories.get(i);
+                            Class df = (Class)
+                                 cachedDeserFactories.get(i);
+                            _call.registerTypeMapping(cls, qName, sf, df, false);
+                        }
+                        else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) {
+                            org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory)
+                                 cachedSerFactories.get(i);
+                            org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory)
+                                 cachedDeserFactories.get(i);
+                            _call.registerTypeMapping(cls, qName, sf, df, false);
+                        }
+                    }
+                }
+            }
+            return _call;
+        }
+        catch (Throwable _t) {
+            throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
+        }
+    }
+
+    public String invokeJson(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[0]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "invokeJson"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {strRequest});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public String invokeXML(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[1]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "invokeXML"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {strRequest});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public String thirdJson(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[2]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "thirdJson"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {strRequest});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public String thirdXML(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[3]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "thirdXML"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {strRequest});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public String writeFileJson(String request, byte[] fileData) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[4]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "writeFileJson"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {request, fileData});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public byte[] readFileJson(String request) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[5]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "readFileJson"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {request});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (byte[]) _resp;
+            } catch (Exception _exception) {
+                return (byte[]) org.apache.axis.utils.JavaUtils.convert(_resp, byte[].class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public String writeFileXml(String request, byte[] fileData) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[6]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "writeFileXml"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {request, fileData});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (String) _resp;
+            } catch (Exception _exception) {
+                return (String) org.apache.axis.utils.JavaUtils.convert(_resp, String.class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+    public byte[] readFileXml(String request) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException {
+        if (super.cachedEndpoint == null) {
+            throw new org.apache.axis.NoEndPointException();
+        }
+        org.apache.axis.client.Call _call = createCall();
+        _call.setOperation(_operations[7]);
+        _call.setUseSOAPAction(true);
+        _call.setSOAPActionURI("");
+        _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
+        _call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.face.cd.eas.kingdee.com", "readFileXml"));
+
+        setRequestHeaders(_call);
+        setAttachments(_call);
+ try {        Object _resp = _call.invoke(new Object[] {request});
+
+        if (_resp instanceof java.rmi.RemoteException) {
+            throw (java.rmi.RemoteException)_resp;
+        }
+        else {
+            extractAttachments(_call);
+            try {
+                return (byte[]) _resp;
+            } catch (Exception _exception) {
+                return (byte[]) org.apache.axis.utils.JavaUtils.convert(_resp, byte[].class);
+            }
+        }
+  } catch (org.apache.axis.AxisFault axisFaultException) {
+    if (axisFaultException.detail != null) {
+        if (axisFaultException.detail instanceof java.rmi.RemoteException) {
+              throw (java.rmi.RemoteException) axisFaultException.detail;
+         }
+        if (axisFaultException.detail instanceof com.steerinfo.dil.wsdl.WSInvokeException) {
+              throw (com.steerinfo.dil.wsdl.WSInvokeException) axisFaultException.detail;
+         }
+   }
+  throw axisFaultException;
+}
+    }
+
+}

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

@@ -0,0 +1,22 @@
+/**
+ * WSFaceFacadeSrvProxy.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.steerinfo.dil.wsdl;
+
+import javax.jws.WebService;
+
+@WebService
+public interface WSFaceFacadeSrvProxy extends java.rmi.Remote {
+    public String invokeJson(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public String invokeXML(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public String thirdJson(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public String thirdXML(String strRequest) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public String writeFileJson(String request, byte[] fileData) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public byte[] readFileJson(String request) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public String writeFileXml(String request, byte[] fileData) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+    public byte[] readFileXml(String request) throws java.rmi.RemoteException, com.steerinfo.dil.wsdl.WSInvokeException;
+}

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

@@ -0,0 +1,16 @@
+/**
+ * WSFaceFacadeSrvProxyService.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.steerinfo.dil.wsdl;
+
+public interface WSFaceFacadeSrvProxyService extends javax.xml.rpc.Service {
+    public String getWSFaceFacadeAddress();
+
+    public com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy getWSFaceFacade() throws javax.xml.rpc.ServiceException;
+
+    public com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy getWSFaceFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
+}

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

@@ -0,0 +1,142 @@
+/**
+ * WSFaceFacadeSrvProxyServiceLocator.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.steerinfo.dil.wsdl;
+
+public class WSFaceFacadeSrvProxyServiceLocator extends org.apache.axis.client.Service implements com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxyService {
+
+    public WSFaceFacadeSrvProxyServiceLocator() {
+    }
+
+
+    public WSFaceFacadeSrvProxyServiceLocator(org.apache.axis.EngineConfiguration config) {
+        super(config);
+    }
+
+    public WSFaceFacadeSrvProxyServiceLocator(String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException {
+        super(wsdlLoc, sName);
+    }
+
+    // Use to get a proxy class for WSFaceFacade
+    private String WSFaceFacade_address = "http://172.16.62.243:56898/ormrpc/services/WSFaceFacade";
+
+    public String getWSFaceFacadeAddress() {
+        return WSFaceFacade_address;
+    }
+
+    // The WSDD service name defaults to the port name.
+    private String WSFaceFacadeWSDDServiceName = "WSFaceFacade";
+
+    public String getWSFaceFacadeWSDDServiceName() {
+        return WSFaceFacadeWSDDServiceName;
+    }
+
+    public void setWSFaceFacadeWSDDServiceName(String name) {
+        WSFaceFacadeWSDDServiceName = name;
+    }
+
+    public com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy getWSFaceFacade() throws javax.xml.rpc.ServiceException {
+       java.net.URL endpoint;
+        try {
+            endpoint = new java.net.URL(WSFaceFacade_address);
+        }
+        catch (java.net.MalformedURLException e) {
+            throw new javax.xml.rpc.ServiceException(e);
+        }
+        return getWSFaceFacade(endpoint);
+    }
+
+    public com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy getWSFaceFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
+        try {
+            com.steerinfo.dil.wsdl.WSFaceFacadeSoapBindingStub _stub = new com.steerinfo.dil.wsdl.WSFaceFacadeSoapBindingStub(portAddress, this);
+            _stub.setPortName(getWSFaceFacadeWSDDServiceName());
+            return _stub;
+        }
+        catch (org.apache.axis.AxisFault e) {
+            return null;
+        }
+    }
+
+    public void setWSFaceFacadeEndpointAddress(String address) {
+        WSFaceFacade_address = address;
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        try {
+            if (com.steerinfo.dil.wsdl.WSFaceFacadeSrvProxy.class.isAssignableFrom(serviceEndpointInterface)) {
+                com.steerinfo.dil.wsdl.WSFaceFacadeSoapBindingStub _stub = new com.steerinfo.dil.wsdl.WSFaceFacadeSoapBindingStub(new java.net.URL(WSFaceFacade_address), this);
+                _stub.setPortName(getWSFaceFacadeWSDDServiceName());
+                return _stub;
+            }
+        }
+        catch (Throwable t) {
+            throw new javax.xml.rpc.ServiceException(t);
+        }
+        throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
+    }
+
+    /**
+     * For the given interface, get the stub implementation.
+     * If this service has no port for the given interface,
+     * then ServiceException is thrown.
+     */
+    public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
+        if (portName == null) {
+            return getPort(serviceEndpointInterface);
+        }
+        String inputPortName = portName.getLocalPart();
+        if ("WSFaceFacade".equals(inputPortName)) {
+            return getWSFaceFacade();
+        }
+        else  {
+            java.rmi.Remote _stub = getPort(serviceEndpointInterface);
+            ((org.apache.axis.client.Stub) _stub).setPortName(portName);
+            return _stub;
+        }
+    }
+
+    public javax.xml.namespace.QName getServiceName() {
+        return new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "WSFaceFacadeSrvProxyService");
+    }
+
+    private java.util.HashSet ports = null;
+
+    public java.util.Iterator getPorts() {
+        if (ports == null) {
+            ports = new java.util.HashSet();
+            ports.add(new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "WSFaceFacade"));
+        }
+        return ports.iterator();
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(String portName, String address) throws javax.xml.rpc.ServiceException {
+        
+if ("WSFaceFacade".equals(portName)) {
+            setWSFaceFacadeEndpointAddress(address);
+        }
+        else 
+{ // Unknown Port Name
+            throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
+        }
+    }
+
+    /**
+    * Set the endpoint address for the specified port name.
+    */
+    public void setEndpointAddress(javax.xml.namespace.QName portName, String address) throws javax.xml.rpc.ServiceException {
+        setEndpointAddress(portName.getLocalPart(), address);
+    }
+
+}

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

@@ -0,0 +1,87 @@
+/**
+ * WSInvokeException.java
+ *
+ * This file was auto-generated from WSDL
+ * by the Apache Axis 1.4 Apr 22, 2006 (06:55:48 PDT) WSDL2Java emitter.
+ */
+
+package com.steerinfo.dil.wsdl;
+
+public class WSInvokeException  extends org.apache.axis.AxisFault  implements java.io.Serializable {
+    public WSInvokeException() {
+    }
+
+    private Object __equalsCalc = null;
+    public synchronized boolean equals(Object obj) {
+        if (!(obj instanceof WSInvokeException)) return false;
+        WSInvokeException other = (WSInvokeException) obj;
+        if (obj == null) return false;
+        if (this == obj) return true;
+        if (__equalsCalc != null) {
+            return (__equalsCalc == obj);
+        }
+        __equalsCalc = obj;
+        boolean _equals;
+        _equals = true;
+        __equalsCalc = null;
+        return _equals;
+    }
+
+    private boolean __hashCodeCalc = false;
+    public synchronized int hashCode() {
+        if (__hashCodeCalc) {
+            return 0;
+        }
+        __hashCodeCalc = true;
+        int _hashCode = 1;
+        __hashCodeCalc = false;
+        return _hashCode;
+    }
+
+    // Type metadata
+    private static org.apache.axis.description.TypeDesc typeDesc =
+        new org.apache.axis.description.TypeDesc(WSInvokeException.class, true);
+
+    static {
+        typeDesc.setXmlType(new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"));
+    }
+
+    /**
+     * Return type metadata object
+     */
+    public static org.apache.axis.description.TypeDesc getTypeDesc() {
+        return typeDesc;
+    }
+
+    /**
+     * Get Custom Serializer
+     */
+    public static org.apache.axis.encoding.Serializer getSerializer(
+           String mechType,
+           Class _javaType,
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanSerializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+    /**
+     * Get Custom Deserializer
+     */
+    public static org.apache.axis.encoding.Deserializer getDeserializer(
+           String mechType,
+           Class _javaType,
+           javax.xml.namespace.QName _xmlType) {
+        return 
+          new  org.apache.axis.encoding.ser.BeanDeserializer(
+            _javaType, _xmlType, typeDesc);
+    }
+
+
+    /**
+     * Writes the exception data to the faultDetails
+     */
+    public void writeDetails(javax.xml.namespace.QName qname, org.apache.axis.encoding.SerializationContext context) throws java.io.IOException {
+        context.serialize(qname, null, this);
+    }
+}

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,7 +543,7 @@
     </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}
@@ -557,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

@@ -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,99 +352,112 @@
         #{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",
-               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.SUPPLIER_NAME        AS "startingPoint",
+               RP2.SHIPPER_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
                  LEFT JOIN DIL_BATCH DB
                            ON DB.RESULT_FOREIGN_SHIP_NAME = BHF.FEE_FOREIGN_SHIP_NAME
                                AND DB.MATERIAL_ID = BHF.MATERIAL_ID
-                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
-                           ON ADN.BATCH_ID = DB.BATCH_ID
-                 LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
-                           ON ADA.BATCH_ID = DB.BATCH_ID
-                 LEFT JOIN RMS_PORT RP1
-                           ON RP1.PORT_ID = ADN.PORT_ID
-                 LEFT JOIN RMS_PORT RP2
-                           ON RP2.PORT_ID = ADA.DOWN_SWIM_PORT_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.BATCH_ID = DB.BATCH_ID
+                 LEFT JOIN RMS_SUPPLIER RP1
+                           ON RP1.SUPPLIER_ID = apo.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_SHIPPER RP2
+                           ON RP2.SHIPPER_ID = APO.RECEIVE_UNIT_ID
         WHERE BHF.FEE_ID = #{feeId}
     </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",
+               RSU.SUPPLIER_NAME           AS "forwardUnitName",
+               RSU.SUPPLIER_NAME           AS "collectionUnitName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "collectionUnitNum"
         FROM BMSPORT_HANDLING_FEE BHF
                  LEFT JOIN DIL_BATCH DB
                            ON DB.RESULT_FOREIGN_SHIP_NAME = BHF.FEE_FOREIGN_SHIP_NAME
@@ -411,5 +468,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 "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

@@ -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,54 @@
     </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",
+        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
                            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 "payUnitName"
+        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 "payUnitName",
+               RSH.SHIPPER_NAME           AS "collectionUnitName",
+               RS.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RS.SUPPLIER_NAME           AS "forwordUnitName"
+        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 RS.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit",
-               RP.PORT_NAME AS "collectionName"
+    <!-- 水运费发货单位和收款单位 -->
+    <select id="getShipOtherMessage" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT RS.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RS.SUPPLIER_NAME           AS "forwordUnitName",
+               RP.PORT_NAME               AS "collectionUnitName"
         FROM BMSSHIP_DETAILS_STATEMENT BDS
                  LEFT JOIN BMSSHIP_DETAILS_ORDER BDO
                            ON BDO.DETAILS_ID = BDS.DETAILS_ID
@@ -403,5 +461,20 @@
                            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>
+
+    <select id="getWaterFeeMembers" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT
+        RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RSU.SUPPLIER_NAME AS "forwordUnitName",
+               RSH.SHIPPER_NAME AS "payUnitName"
+        FROM BMSSHIP_STATEMENT BS
+LEFT JOIN AMS_PURCHASE_ORDER APO
+ON APO.BATCH_ID = BS.BATCH_ID
+LEFT JOIN RMS_SHIPPER RSH
+ON RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+LEFT JOIN RMS_SUPPLIER RSU
+ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
     </select>
 </mapper>

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,19 +349,21 @@
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <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
         WHERE BS.STATEMENT_ID = #{statementId}
     </select>
 
+    <!-- 发货单位 -->
     <select id="getCarrierAndReceiver" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT RSU.SUPPLIER_DUTY_PARAGRAPH AS "statementSendUnit"
+        SELECT RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RSU.SUPPLIER_NAME           AS "forwordUnitName"
         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",
+                        ASPM.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
@@ -455,27 +455,29 @@
                            ON RS.SHIPPER_ID = ASO.SHIPPER_ID
                  LEFT JOIN RMS_CONSIGNEE RCO
                            ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
-                 LEFT JOIN AMS_SALE_PLAN ASP
-                           ON ASP.PLAN_ID = ASO.PLAN_ID
+                 LEFT JOIN AMS_SALE_PLAN_MATERIAL ASPM
+                           ON ASPM.PLAN_MATERIAL_ID = ASO.PLAN_ID
                  LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
                            ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
                  LEFT JOIN RMS_CARRIER RC
                            ON RC.CARRIER_ID = ADSO.CARRIER_ID
                  LEFT JOIN RMS_MATERIAL RM
-                           ON RM.MATERIAL_ID = ASP.MATERIAL_ID
+                           ON RM.MATERIAL_ID = ASPM.MATERIAL_ID
         WHERE BDS.STATEMENT_ID = #{statementId}
     </select>
 
     <!-- 查询采购计费详单 -->
     <select id="getPurchaseDetailsOrder" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT BDO.DETAILS_NO                    AS "detailsNo",
-               BDO.DETAILS_TIME                  AS "detailsTime",
-               RCP.CAPACITY_NUMBER               AS "capacityNumber",
-               APO.PUCHASE_ORDER_MATERIAL_NUMBER AS "materialNumber",
-               BDO.DETAILS_AMOUNT                AS "detailsAmount",
-               RCR.CARRIER_NAME                  AS "carrierName",
-               RM.MATERIAL_CODE                  AS "materialCode",
-               RM.MATERIAL_NAME                  AS "materialName"
+        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",
+               RSU.SUPPLIER_NAME                 AS "startingPoint",
+               RSH.SHIPPER_NAME                  AS "endPoint"
         FROM BMSTRUCK_DETAILS_ORDER BDO
                  LEFT JOIN OMSTRUCK_ORDER OO
                            ON OO.ORDER_ID = BDO.ORDER_ID
@@ -485,6 +487,10 @@
                            ON RCP.CAPACITY_ID = RDC.CAPACITY_ID
                  LEFT JOIN AMS_PURCHASE_ORDER APO
                            ON BDO.PURCHASE_ORDER_ID = APO.PURCHASE_ORDER_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
                  LEFT JOIN AMSTRUCK_PURPLAN AP
                            ON AP.BATCH_ID = APO.BATCH_ID
                  LEFT JOIN RMS_CARRIER RCR
@@ -498,10 +504,12 @@
 
     <!-- 查询采购汽运账单所需信息 -->
     <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",
+               RSU.SUPPLIER_NAME           AS "collectionUnitName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "collectionUnitNum",
+               RS.SHIPPER_NAME             AS "payUnitName",
+               RSU.SUPPLIER_DUTY_PARAGRAPH AS "forwordUnitNum",
+               RSU.SUPPLIER_NAME           AS "forwordUnitName"
         FROM BMSTRUCK_DETAILS_ORDER BDO
                  LEFT JOIN AMS_PURCHASE_ORDER APO
                            ON APO.PURCHASE_ORDER_ID = BDO.PURCHASE_ORDER_ID
@@ -513,5 +521,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>

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

@@ -456,20 +456,20 @@
 
     <!-- 得到账单信息 -->
     <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",
+               RC.CONSIGNEE_CODE         AS "receivedUnitNum",
+               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>

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

@@ -11,7 +11,7 @@
     <result column="CONSIGNEE_CONTACT_NAME" jdbcType="VARCHAR" property="consigneeContactName" />
     <result column="CONSIGNEE_WARRANTY_AMOUNT" jdbcType="DECIMAL" property="consigneeWarrantyAmount" />
     <result column="CONSIGNEE_WARRANTY_WEIGHT" jdbcType="VARCHAR" property="consigneeWarrantyWeight" />
-    <result column="CONSIGNEE_CONTACT_TEL" jdbcType="CHAR" property="consigneeContactTel" />
+    <result column="CONSIGNEE_CONTACT_TEL" jdbcType="VARCHAR" property="consigneeContactTel" />
     <result column="CONSIGNEE_EXCHANGE_DELIVERY" jdbcType="DECIMAL" property="consigneeExchangeDelivery" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
@@ -20,19 +20,21 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="EAS_CONSIGNEE_ID" jdbcType="VARCHAR" property="easConsigneeId" />
+    <result column="CONSIGNEE_CODE" jdbcType="VARCHAR" property="consigneeCode" />
   </resultMap>
   <sql id="columns">
-    CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
-    CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
-    CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID
+    CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS,
+    CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT,
+    CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID,
+    CONSIGNEE_CODE
   </sql>
   <sql id="columns_alias">
-    t.CONSIGNEE_ID, t.CONSIGNEE_COMPANY_NAME, t.CONSIGNEE_ABBREVIATION, t.CONSIGNEE_REGISTERED_ADDRESS, 
-    t.CONSIGNEE_RECEIVE_ADDRESS, t.CONSIGNEE_REGISTRATION_TIME, t.CONSIGNEE_CONTACT_NAME, 
-    t.CONSIGNEE_WARRANTY_AMOUNT, t.CONSIGNEE_WARRANTY_WEIGHT, t.CONSIGNEE_CONTACT_TEL, 
-    t.CONSIGNEE_EXCHANGE_DELIVERY, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_CONSIGNEE_ID
+    t.CONSIGNEE_ID, t.CONSIGNEE_COMPANY_NAME, t.CONSIGNEE_ABBREVIATION, t.CONSIGNEE_REGISTERED_ADDRESS,
+    t.CONSIGNEE_RECEIVE_ADDRESS, t.CONSIGNEE_REGISTRATION_TIME, t.CONSIGNEE_CONTACT_NAME,
+    t.CONSIGNEE_WARRANTY_AMOUNT, t.CONSIGNEE_WARRANTY_WEIGHT, t.CONSIGNEE_CONTACT_TEL,
+    t.CONSIGNEE_EXCHANGE_DELIVERY, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME,
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_CONSIGNEE_ID, t.CONSIGNEE_CODE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM RMS_CONSIGNEE
@@ -41,7 +43,7 @@
     SELECT <include refid="columns_alias" /> FROM RMS_CONSIGNEE t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="consigneeId != null">
         and CONSIGNEE_ID = #{consigneeId}
       </if>
@@ -69,7 +71,7 @@
       <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
         and CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
       </if>
-      <if test="consigneeContactTel != null">
+      <if test="consigneeContactTel != null and consigneeContactTel != ''">
         and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
       </if>
       <if test="consigneeExchangeDelivery != null">
@@ -96,10 +98,13 @@
       <if test="easConsigneeId != null and easConsigneeId != ''">
         and EAS_CONSIGNEE_ID = #{easConsigneeId}
       </if>
+      <if test="consigneeCode != null and consigneeCode != ''">
+        and CONSIGNEE_CODE = #{consigneeCode}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="consigneeId != null">
         and CONSIGNEE_ID = #{consigneeId}
       </if>
@@ -127,8 +132,8 @@
       <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
         and CONSIGNEE_WARRANTY_WEIGHT LIKE '%${consigneeWarrantyWeight}%'
       </if>
-      <if test="consigneeContactTel != null">
-        and CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
+      <if test="consigneeContactTel != null and consigneeContactTel != ''">
+        and CONSIGNEE_CONTACT_TEL LIKE '%${consigneeContactTel}%'
       </if>
       <if test="consigneeExchangeDelivery != null">
         and CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
@@ -154,6 +159,9 @@
       <if test="easConsigneeId != null and easConsigneeId != ''">
         and EAS_CONSIGNEE_ID LIKE '%${easConsigneeId}%'
       </if>
+      <if test="consigneeCode != null and consigneeCode != ''">
+        and CONSIGNEE_CODE LIKE '%${consigneeCode}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
@@ -162,78 +170,81 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from RMS_CONSIGNEE
-    where 1!=1 
-      <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
-        or CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
-      </if>
-      <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
-        or CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
-      </if>
-      <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
-        or CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
-      </if>
-      <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
-        or CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
-      </if>
-      <if test="consigneeRegistrationTime != null">
-        or TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = '#{consigneeRegistrationTime}'
-      </if>
-      <if test="consigneeContactName != null and consigneeContactName != ''">
-        or CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
-      </if>
-      <if test="consigneeWarrantyAmount != null">
-        or CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
-      </if>
-      <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
-        or CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
-      </if>
-      <if test="consigneeContactTel != null">
-        or CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
-      </if>
-      <if test="consigneeExchangeDelivery != null">
-        or CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="easConsigneeId != null and easConsigneeId != ''">
-        or EAS_CONSIGNEE_ID = #{easConsigneeId}
-      </if>
+    where 1!=1
+    <if test="consigneeCompanyName != null and consigneeCompanyName != ''">
+      or CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName}
+    </if>
+    <if test="consigneeAbbreviation != null and consigneeAbbreviation != ''">
+      or CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation}
+    </if>
+    <if test="consigneeRegisteredAddress != null and consigneeRegisteredAddress != ''">
+      or CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress}
+    </if>
+    <if test="consigneeReceiveAddress != null and consigneeReceiveAddress != ''">
+      or CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress}
+    </if>
+    <if test="consigneeRegistrationTime != null">
+      or TO_CHAR(CONSIGNEE_REGISTRATION_TIME,'yyyy-MM-dd') = '#{consigneeRegistrationTime}'
+    </if>
+    <if test="consigneeContactName != null and consigneeContactName != ''">
+      or CONSIGNEE_CONTACT_NAME = #{consigneeContactName}
+    </if>
+    <if test="consigneeWarrantyAmount != null">
+      or CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount}
+    </if>
+    <if test="consigneeWarrantyWeight != null and consigneeWarrantyWeight != ''">
+      or CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight}
+    </if>
+    <if test="consigneeContactTel != null and consigneeContactTel != ''">
+      or CONSIGNEE_CONTACT_TEL = #{consigneeContactTel}
+    </if>
+    <if test="consigneeExchangeDelivery != null">
+      or CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery}
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="easConsigneeId != null and easConsigneeId != ''">
+      or EAS_CONSIGNEE_ID = #{easConsigneeId}
+    </if>
+    <if test="consigneeCode != null and consigneeCode != ''">
+      or CONSIGNEE_CODE = #{consigneeCode}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsConsignee">
-    insert into RMS_CONSIGNEE (CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME, 
-      CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS, 
-      CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME, 
-      CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT, 
-      CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL, 
-      CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID
-      )
-    values (#{consigneeId,jdbcType=DECIMAL}, #{consigneeCompanyName,jdbcType=VARCHAR}, 
-      #{consigneeAbbreviation,jdbcType=VARCHAR}, #{consigneeRegisteredAddress,jdbcType=VARCHAR}, 
-      #{consigneeReceiveAddress,jdbcType=VARCHAR}, #{consigneeRegistrationTime,jdbcType=TIMESTAMP}, 
-      #{consigneeContactName,jdbcType=VARCHAR}, #{consigneeWarrantyAmount,jdbcType=DECIMAL}, 
-      #{consigneeWarrantyWeight,jdbcType=VARCHAR}, #{consigneeContactTel,jdbcType=CHAR}, 
-      #{consigneeExchangeDelivery,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easConsigneeId,jdbcType=VARCHAR}
-      )
+    insert into RMS_CONSIGNEE (CONSIGNEE_ID, CONSIGNEE_COMPANY_NAME,
+                               CONSIGNEE_ABBREVIATION, CONSIGNEE_REGISTERED_ADDRESS,
+                               CONSIGNEE_RECEIVE_ADDRESS, CONSIGNEE_REGISTRATION_TIME,
+                               CONSIGNEE_CONTACT_NAME, CONSIGNEE_WARRANTY_AMOUNT,
+                               CONSIGNEE_WARRANTY_WEIGHT, CONSIGNEE_CONTACT_TEL,
+                               CONSIGNEE_EXCHANGE_DELIVERY, INSERT_USERNAME,
+                               INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                               INSERT_UPDATE_REMARK, DELETED, EAS_CONSIGNEE_ID,
+                               CONSIGNEE_CODE)
+    values (#{consigneeId,jdbcType=DECIMAL}, #{consigneeCompanyName,jdbcType=VARCHAR},
+            #{consigneeAbbreviation,jdbcType=VARCHAR}, #{consigneeRegisteredAddress,jdbcType=VARCHAR},
+            #{consigneeReceiveAddress,jdbcType=VARCHAR}, #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
+            #{consigneeContactName,jdbcType=VARCHAR}, #{consigneeWarrantyAmount,jdbcType=DECIMAL},
+            #{consigneeWarrantyWeight,jdbcType=VARCHAR}, #{consigneeContactTel,jdbcType=VARCHAR},
+            #{consigneeExchangeDelivery,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easConsigneeId,jdbcType=VARCHAR},
+            #{consigneeCode,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
     insert into RMS_CONSIGNEE
@@ -292,6 +303,9 @@
       <if test="easConsigneeId != null">
         EAS_CONSIGNEE_ID,
       </if>
+      <if test="consigneeCode != null">
+        CONSIGNEE_CODE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="consigneeId != null">
@@ -322,7 +336,7 @@
         #{consigneeWarrantyWeight,jdbcType=VARCHAR},
       </if>
       <if test="consigneeContactTel != null">
-        #{consigneeContactTel,jdbcType=CHAR},
+        #{consigneeContactTel,jdbcType=VARCHAR},
       </if>
       <if test="consigneeExchangeDelivery != null">
         #{consigneeExchangeDelivery,jdbcType=DECIMAL},
@@ -348,27 +362,31 @@
       <if test="easConsigneeId != null">
         #{easConsigneeId,jdbcType=VARCHAR},
       </if>
+      <if test="consigneeCode != null">
+        #{consigneeCode,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsConsignee">
     update RMS_CONSIGNEE
     set CONSIGNEE_COMPANY_NAME = #{consigneeCompanyName,jdbcType=VARCHAR},
-      CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
-      CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
-      CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
-      CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
-      CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
-      CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
-      CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
-      CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=CHAR},
-      CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR}
+        CONSIGNEE_ABBREVIATION = #{consigneeAbbreviation,jdbcType=VARCHAR},
+        CONSIGNEE_REGISTERED_ADDRESS = #{consigneeRegisteredAddress,jdbcType=VARCHAR},
+        CONSIGNEE_RECEIVE_ADDRESS = #{consigneeReceiveAddress,jdbcType=VARCHAR},
+        CONSIGNEE_REGISTRATION_TIME = #{consigneeRegistrationTime,jdbcType=TIMESTAMP},
+        CONSIGNEE_CONTACT_NAME = #{consigneeContactName,jdbcType=VARCHAR},
+        CONSIGNEE_WARRANTY_AMOUNT = #{consigneeWarrantyAmount,jdbcType=DECIMAL},
+        CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
+        CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=VARCHAR},
+        CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR},
+        CONSIGNEE_CODE = #{consigneeCode,jdbcType=VARCHAR}
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsConsignee">
@@ -399,7 +417,7 @@
         CONSIGNEE_WARRANTY_WEIGHT = #{consigneeWarrantyWeight,jdbcType=VARCHAR},
       </if>
       <if test="consigneeContactTel != null">
-        CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=CHAR},
+        CONSIGNEE_CONTACT_TEL = #{consigneeContactTel,jdbcType=VARCHAR},
       </if>
       <if test="consigneeExchangeDelivery != null">
         CONSIGNEE_EXCHANGE_DELIVERY = #{consigneeExchangeDelivery,jdbcType=DECIMAL},
@@ -425,6 +443,9 @@
       <if test="easConsigneeId != null">
         EAS_CONSIGNEE_ID = #{easConsigneeId,jdbcType=VARCHAR},
       </if>
+      <if test="consigneeCode != null">
+        CONSIGNEE_CODE = #{consigneeCode,jdbcType=VARCHAR},
+      </if>
     </set>
     where CONSIGNEE_ID = #{consigneeId,jdbcType=DECIMAL}
   </update>
@@ -441,114 +462,120 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into RMS_CONSIGNEE 
-      (CONSIGNEE_ID, 
-      CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION, 
-      CONSIGNEE_REGISTERED_ADDRESS, CONSIGNEE_RECEIVE_ADDRESS, 
-      CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME, 
-      CONSIGNEE_WARRANTY_AMOUNT, CONSIGNEE_WARRANTY_WEIGHT, 
-      CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, 
-      EAS_CONSIGNEE_ID)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.consigneeId,jdbcType=DECIMAL}, 
-      #{item.consigneeCompanyName,jdbcType=VARCHAR}, #{item.consigneeAbbreviation,jdbcType=VARCHAR}, 
-      #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}, #{item.consigneeReceiveAddress,jdbcType=VARCHAR}, 
-      #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}, #{item.consigneeContactName,jdbcType=VARCHAR}, 
-      #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}, #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}, 
-      #{item.consigneeContactTel,jdbcType=CHAR}, #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}, 
-      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
-      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
-      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, 
-      #{item.easConsigneeId,jdbcType=VARCHAR} from dual  
-   </foreach> )
+    insert into RMS_CONSIGNEE
+    (CONSIGNEE_ID,
+    CONSIGNEE_COMPANY_NAME, CONSIGNEE_ABBREVIATION,
+    CONSIGNEE_REGISTERED_ADDRESS, CONSIGNEE_RECEIVE_ADDRESS,
+    CONSIGNEE_REGISTRATION_TIME, CONSIGNEE_CONTACT_NAME,
+    CONSIGNEE_WARRANTY_AMOUNT, CONSIGNEE_WARRANTY_WEIGHT,
+    CONSIGNEE_CONTACT_TEL, CONSIGNEE_EXCHANGE_DELIVERY,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    EAS_CONSIGNEE_ID, CONSIGNEE_CODE
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.consigneeId,jdbcType=DECIMAL},
+    #{item.consigneeCompanyName,jdbcType=VARCHAR}, #{item.consigneeAbbreviation,jdbcType=VARCHAR},
+    #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}, #{item.consigneeReceiveAddress,jdbcType=VARCHAR},
+    #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}, #{item.consigneeContactName,jdbcType=VARCHAR},
+    #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}, #{item.consigneeWarrantyWeight,jdbcType=VARCHAR},
+    #{item.consigneeContactTel,jdbcType=VARCHAR}, #{item.consigneeExchangeDelivery,jdbcType=DECIMAL},
+    #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
+    #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
+    #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+    #{item.easConsigneeId,jdbcType=VARCHAR}, #{item.consigneeCode,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update RMS_CONSIGNEE
-     set
-       CONSIGNEE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
-       </foreach>
-       ,CONSIGNEE_COMPANY_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCompanyName,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_ABBREVIATION=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeAbbreviation,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_REGISTERED_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_RECEIVE_ADDRESS=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeReceiveAddress,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_REGISTRATION_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,CONSIGNEE_CONTACT_NAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactName,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_WARRANTY_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,CONSIGNEE_WARRANTY_WEIGHT=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}
-       </foreach>
-       ,CONSIGNEE_CONTACT_TEL=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactTel,jdbcType=CHAR}
-       </foreach>
-       ,CONSIGNEE_EXCHANGE_DELIVERY=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,EAS_CONSIGNEE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
-          when #{item.consigneeId,jdbcType=DECIMAL} then #{item.easConsigneeId,jdbcType=VARCHAR}
-       </foreach>
-     where CONSIGNEE_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.consigneeId,jdbcType=DECIMAL}
-     </foreach> 
+    update RMS_CONSIGNEE
+    set
+    CONSIGNEE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeId,jdbcType=DECIMAL}
+    </foreach>
+    ,CONSIGNEE_COMPANY_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCompanyName,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_ABBREVIATION=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeAbbreviation,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_REGISTERED_ADDRESS=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegisteredAddress,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_RECEIVE_ADDRESS=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeReceiveAddress,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_REGISTRATION_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeRegistrationTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,CONSIGNEE_CONTACT_NAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactName,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_WARRANTY_AMOUNT=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyAmount,jdbcType=DECIMAL}
+    </foreach>
+    ,CONSIGNEE_WARRANTY_WEIGHT=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeWarrantyWeight,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_CONTACT_TEL=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeContactTel,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_EXCHANGE_DELIVERY=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeExchangeDelivery,jdbcType=DECIMAL}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,EAS_CONSIGNEE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.easConsigneeId,jdbcType=VARCHAR}
+    </foreach>
+    ,CONSIGNEE_CODE=
+    <foreach close="end" collection="list" index="index" item="item" open="case CONSIGNEE_ID" separator=" ">
+      when #{item.consigneeId,jdbcType=DECIMAL} then #{item.consigneeCode,jdbcType=VARCHAR}
+    </foreach>
+    where CONSIGNEE_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.consigneeId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from RMS_CONSIGNEE
-    where CONSIGNEE_ID in 
+    where CONSIGNEE_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -556,5 +583,4 @@
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
-  
 </mapper>

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

@@ -6,7 +6,7 @@
     <result column="MATERIAL_TYPE_NAME" jdbcType="VARCHAR" property="materialTypeName" />
     <result column="MATERIAL_UNIT" jdbcType="VARCHAR" property="materialUnit" />
     <result column="MATERIAL_ORDER" jdbcType="DECIMAL" property="materialOrder" />
-    <result column="MATERIAL_PACKING_TYPE" jdbcType="VARCHAR" property="materialPackingType" />
+    <result column="MATERIAL_TYPE_STATUS" jdbcType="DECIMAL" property="materialTypeStatus" />
     <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
     <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
     <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
@@ -14,11 +14,11 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
   </resultMap>
   <sql id="columns">
-    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+    MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
   </sql>
   <sql id="columns_alias">
-    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_PACKING_TYPE, 
+    t.MATERIAL_TYPE_ID, t.MATERIAL_TYPE_NAME, t.MATERIAL_UNIT, t.MATERIAL_ORDER, t.MATERIAL_TYPE_STATUS, 
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
   </sql>
   <sql id="select">
@@ -41,8 +41,8 @@
       <if test="materialOrder != null">
         and MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE = #{materialPackingType}
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        and MATERIAL_TYPE_STATUS = #{materialTypeStatus}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME = #{insertUsername}
@@ -75,8 +75,8 @@
       <if test="materialOrder != null">
         and MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        and MATERIAL_PACKING_TYPE LIKE '%${materialPackingType}%'
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        and MATERIAL_TYPE_STATUS LIKE '%${materialTypeStatus}%'
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         and INSERT_USERNAME LIKE '%${insertUsername}%'
@@ -111,8 +111,8 @@
       <if test="materialOrder != null">
         or MATERIAL_ORDER = #{materialOrder}
       </if>
-      <if test="materialPackingType != null and materialPackingType != ''">
-        or MATERIAL_PACKING_TYPE = #{materialPackingType}
+      <if test="materialTypeStatus != null and materialTypeStatus != ''">
+        or MATERIAL_TYPE_STATUS = #{materialTypeStatus}
       </if>
       <if test="insertUsername != null and insertUsername != ''">
         or INSERT_USERNAME = #{insertUsername}
@@ -132,11 +132,11 @@
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.RmsMaterialType">
     insert into RMS_MATERIAL_TYPE (MATERIAL_TYPE_ID, MATERIAL_TYPE_NAME, 
-      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      MATERIAL_UNIT, MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
       INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
       UPDATE_TIME, INSERT_UPDATE_REMARK)
     values (#{materialTypeId,jdbcType=DECIMAL}, #{materialTypeName,jdbcType=VARCHAR}, 
-      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialPackingType,jdbcType=VARCHAR}, 
+      #{materialUnit,jdbcType=VARCHAR}, #{materialOrder,jdbcType=DECIMAL}, #{materialTypeStatus,jdbcType=DECIMAL},
       #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR})
   </insert>
@@ -155,8 +155,8 @@
       <if test="materialOrder != null">
         MATERIAL_ORDER,
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE,
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS,
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME,
@@ -187,8 +187,8 @@
       <if test="materialOrder != null">
         #{materialOrder,jdbcType=DECIMAL},
       </if>
-      <if test="materialPackingType != null">
-        #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeStatus != null">
+        #{materialTypeStatus,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         #{insertUsername,jdbcType=VARCHAR},
@@ -212,7 +212,7 @@
     set MATERIAL_TYPE_NAME = #{materialTypeName,jdbcType=VARCHAR},
       MATERIAL_UNIT = #{materialUnit,jdbcType=VARCHAR},
       MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
-      MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
+      MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
       INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
       INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
       UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
@@ -232,8 +232,8 @@
       <if test="materialOrder != null">
         MATERIAL_ORDER = #{materialOrder,jdbcType=DECIMAL},
       </if>
-      <if test="materialPackingType != null">
-        MATERIAL_PACKING_TYPE = #{materialPackingType,jdbcType=VARCHAR},
+      <if test="materialTypeStatus != null">
+        MATERIAL_TYPE_STATUS = #{materialTypeStatus,jdbcType=DECIMAL},
       </if>
       <if test="insertUsername != null">
         INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
@@ -269,7 +269,7 @@
     insert into RMS_MATERIAL_TYPE 
       (MATERIAL_TYPE_ID, 
       MATERIAL_TYPE_NAME, MATERIAL_UNIT, 
-      MATERIAL_ORDER, MATERIAL_PACKING_TYPE, 
+      MATERIAL_ORDER, MATERIAL_TYPE_STATUS, 
       INSERT_USERNAME, INSERT_TIME, 
       UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK)
@@ -277,7 +277,7 @@
    select  
       #{item.materialTypeId,jdbcType=DECIMAL}, 
       #{item.materialTypeName,jdbcType=VARCHAR}, #{item.materialUnit,jdbcType=VARCHAR}, 
-      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialPackingType,jdbcType=VARCHAR}, 
+      #{item.materialOrder,jdbcType=DECIMAL}, #{item.materialTypeStatus,jdbcType=DECIMAL},
       #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
       #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
       #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
@@ -302,9 +302,9 @@
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
           when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialOrder,jdbcType=DECIMAL}
        </foreach>
-       ,MATERIAL_PACKING_TYPE=
+       ,MATERIAL_TYPE_STATUS=
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">
-          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialPackingType,jdbcType=VARCHAR}
+          when #{item.materialTypeId,jdbcType=DECIMAL} then #{item.materialTypeStatus,jdbcType=DECIMAL}
        </foreach>
        ,INSERT_USERNAME=
        <foreach close="end" collection="list" index="index" item="item" open="case MATERIAL_TYPE_ID" separator=" ">

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

@@ -631,4 +631,51 @@
         set twr.ISQUALITY=1
         where twr.RESULT_POUND_NO=#{wzInputId}
     </update>
+
+    <update id="updateTruckWeightResult" parameterType="java.util.Map">
+        UPDATE (
+	SELECT
+		*
+	FROM
+		TMSTRUCK_WEIGHT_RESULT twr
+	WHERE
+		twr.RESULT_TOTAL_ID = (
+		SELECT
+			ttr.RESULT_TOTAL_ID
+		FROM
+			TMSTRUCK_TOTAL_RESULT ttr
+		WHERE
+			ttr.ORDER_ID = ( SELECT oo.ORDER_ID FROM OMSTRUCK_ORDER oo WHERE oo.ORDER_NUMBER = #{orderNumber} )
+		)
+	) tt
+	SET
+	tt.RESULT_TARE_WEIGHT = #{resultWeight},
+	tt.RESULT_NET_WEIGHT = #{resultNetWeight},
+	tt.RESULT_TARE_PLACE_ID = #{resultTarePlaceId},
+	tt.RESULT_TARE_WEIGHT_TIME = TO_DATE( #{resultWeightTime}, 'yyyy-mm-dd hh24:mi:ss' )
+    </update>
+    <update id="updateTruckWeightResultGross" parameterType="java.util.Map">
+                UPDATE (
+	SELECT
+		*
+	FROM
+		TMSTRUCK_WEIGHT_RESULT twr
+	WHERE
+		twr.RESULT_TOTAL_ID = (
+		SELECT
+			ttr.RESULT_TOTAL_ID
+		FROM
+			TMSTRUCK_TOTAL_RESULT ttr
+		WHERE
+			ttr.ORDER_ID = ( SELECT oo.ORDER_ID FROM OMSTRUCK_ORDER oo WHERE oo.ORDER_NUMBER = #{orderNumber} )
+		)
+		and
+		twr.MATERIAL_ID = #{materialId}
+	) tt
+	SET tt.RESULT_POUND_NO = #{resultPoundNo},
+	tt.RESULT_GROSS_WEIGHT = #{resultWeight},
+	tt.RESULT_NET_WEIGHT = #{resultNetWeight},
+	tt.RESULT_GROSS_PLACE_ID = #{resultTarePlaceId},
+	tt.RESULT_GROSS_WEIGHT_TIME = TO_DATE( #{resultWeightTime}, 'yyyy-mm-dd hh24:mi:ss' )
+    </update>
 </mapper>