'销售订单'

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

@@ -37,7 +37,7 @@ public class WSFaceController extends BaseRESTfulController {
     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");
+        service.setServername("172.16.62.243" , "8888");
         String output = null;
         try {
             // 这边是map，将map封装后转为json
@@ -57,9 +57,9 @@ public class WSFaceController extends BaseRESTfulController {
     public String pushSaleOrderToEas(@RequestBody Map<String,Object> map) {
 //        Map<String, Object> totalMap = saleUtil.getTotalMap();
 //        totalMap.put("input",map);
-        com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "zseas85", "L2", 0);
+        com.steerinfo.dil.wsdl.ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
         WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
-        service.setServername("172.16.62.243" , "56898");
+        service.setServername("172.16.33.111" , "8888");
         String output = null;
         try {
             // 这边是map，将map封装后转为json

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

@@ -0,0 +1,43 @@
+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.wsdl.*;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+@RequestMapping("/${api.version}/wmsoutboundresult")
+public class WmsOutboundResultController {
+
+    @PostMapping("/sendWarranty")
+    public String SendWarranty(@RequestBody Map<String,Object> map) {
+
+        ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
+        WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
+        service.setServername("172.16.33.111", "8888");
+        WSContext wsContext = LoginUtil.doEASLogin(service);
+        String sessionId = wsContext.getSessionId();
+        if (null == sessionId) {
+            System.out.println("[error]: 登陆有问题");
+        }
+        String output = null;
+        try {
+            // 这边是map，将map封装后转为json
+            String json = JSONUtils.toJSONString(map);
+            System.out.println(json);
+            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/SSOFeign.java

@@ -0,0 +1,33 @@
+package com.steerinfo.dil.feign;
+
+
+import feign.HeaderMap;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @author HUJIANGUO
+ * @create 2021-11-10 11:30
+ */
+@FeignClient(value = "logistic",url = "https://wl.dasteel.cn:32322")
+public interface SSOFeign {
+
+    @PostMapping("/icore.icp.web/pass/v1/sysusers/")
+    Map<String,Object> addUser(@HeaderMap Map<String,Object> headerMap,
+                               @RequestParam String userCode,
+                               @RequestParam String userName,
+                               @RequestParam String orgCode,
+                               @RequestParam String orgName,
+                               @RequestParam String groupId,
+                               @RequestParam String companyId,
+                               @RequestParam String orgId);
+
+    @PostMapping("pass/v1/sysuserroles/addUserroles")
+    Map<String,Object> addUserroles(@RequestParam String userId,
+                                    @RequestParam String userCode,
+                                    @RequestParam String roleId);
+
+}

src/main/java/com/steerinfo/dil/feign/TokenFeign.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 org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+/**
+ * @author HUJIANGUO
+ * @create 2021-11-10 11:30
+ */
+@FeignClient(value = "logistic",url = "https://wl.dasteel.cn:32322")
+public interface TokenFeign {
+
+    @PostMapping("/icore.icp.web/pass/auth/login")
+    Map<String,Object> login(@RequestParam String loginName,
+                             @RequestParam String password);
+
+
+}

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

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

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

@@ -87,6 +87,24 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="仓库所在厂区",required=false)
     private String saleWarehouse;
 
+    /**
+     * 米数(STEEL_METER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="米数",required=false)
+    private BigDecimal steelMeter;
+
+    /**
+     * 是否磅重销售(IS_POUND_SALE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否磅重销售",required=false)
+    private BigDecimal isPoundSale;
+
+    /**
+     * 物资理重(METER_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资理重",required=false)
+    private BigDecimal meterWeight;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -203,6 +221,30 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         this.saleWarehouse = saleWarehouse == null ? null : saleWarehouse.trim();
     }
 
+    public BigDecimal getSteelMeter() {
+        return steelMeter;
+    }
+
+    public void setSteelMeter(BigDecimal steelMeter) {
+        this.steelMeter = steelMeter;
+    }
+
+    public BigDecimal getIsPoundSale() {
+        return isPoundSale;
+    }
+
+    public void setIsPoundSale(BigDecimal isPoundSale) {
+        this.isPoundSale = isPoundSale;
+    }
+
+    public BigDecimal getMeterWeight() {
+        return meterWeight;
+    }
+
+    public void setMeterWeight(BigDecimal meterWeight) {
+        this.meterWeight = meterWeight;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -222,6 +264,9 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
         sb.append(", saleWarehouse=").append(saleWarehouse);
+        sb.append(", steelMeter=").append(steelMeter);
+        sb.append(", isPoundSale=").append(isPoundSale);
+        sb.append(", meterWeight=").append(meterWeight);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -135,6 +135,12 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="订单关闭状态(0:未关闭；1：已关闭)",required=false)
     private BigDecimal closeStatus;
 
+    /**
+     * 销售员ID(SALER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="销售员ID",required=false)
+    private BigDecimal salerId;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -315,6 +321,14 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.closeStatus = closeStatus;
     }
 
+    public BigDecimal getSalerId() {
+        return salerId;
+    }
+
+    public void setSalerId(BigDecimal salerId) {
+        this.salerId = salerId;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -342,6 +356,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
         sb.append(", closeStatus=").append(closeStatus);
+        sb.append(", salerId=").append(salerId);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,184 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="车序号物资中间表")
+public class AmsSaleTrucknoMaterial implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(TRUCKNO_MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal trucknoMaterialId;
+
+    /**
+     * 物资Id(MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资Id",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 车序号表主键ID(SALE_ORDER_MATERIAL_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="车序号表主键ID",required=false)
+    private BigDecimal saleOrderMaterialId;
+
+    /**
+     * 物资件数(SALE_ORDER_MATERIAL_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资件数",required=false)
+    private BigDecimal saleOrderMaterialNumber;
+
+    /**
+     * 物资理论重量(MATERIAL_THEORETICAL_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资理论重量",required=false)
+    private BigDecimal materialTheoreticalWeight;
+
+    /**
+     * 记录创建人(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.trucknoMaterialId;
+    }
+
+    @Override
+    public void setId(BigDecimal trucknoMaterialId) {
+        this.trucknoMaterialId = trucknoMaterialId;
+    }
+
+    public BigDecimal getTrucknoMaterialId() {
+        return trucknoMaterialId;
+    }
+
+    public void setTrucknoMaterialId(BigDecimal trucknoMaterialId) {
+        this.trucknoMaterialId = trucknoMaterialId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getSaleOrderMaterialId() {
+        return saleOrderMaterialId;
+    }
+
+    public void setSaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
+        this.saleOrderMaterialId = saleOrderMaterialId;
+    }
+
+    public BigDecimal getSaleOrderMaterialNumber() {
+        return saleOrderMaterialNumber;
+    }
+
+    public void setSaleOrderMaterialNumber(BigDecimal saleOrderMaterialNumber) {
+        this.saleOrderMaterialNumber = saleOrderMaterialNumber;
+    }
+
+    public BigDecimal getMaterialTheoreticalWeight() {
+        return materialTheoreticalWeight;
+    }
+
+    public void setMaterialTheoreticalWeight(BigDecimal materialTheoreticalWeight) {
+        this.materialTheoreticalWeight = materialTheoreticalWeight;
+    }
+
+    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(", trucknoMaterialId=").append(trucknoMaterialId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", saleOrderMaterialId=").append(saleOrderMaterialId);
+        sb.append(", saleOrderMaterialNumber=").append(saleOrderMaterialNumber);
+        sb.append(", materialTheoreticalWeight=").append(materialTheoreticalWeight);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -2,9 +2,11 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.AmsSaleMaterialMapper;
 import com.steerinfo.dil.mapper.AmsSaleOrderMapper;
+import com.steerinfo.dil.mapper.AmsSaleTrucknoMaterialMapper;
 import com.steerinfo.dil.mapper.RmsConsigneeMapper;
 import com.steerinfo.dil.model.AmsSaleMaterial;
 import com.steerinfo.dil.model.AmsSaleOrder;
+import com.steerinfo.dil.model.AmsSaleTrucknoMaterial;
 import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
@@ -42,6 +44,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     AmsSaleMaterialMapper amsSaleMaterialMapper;
     @Autowired
     RmsConsigneeMapper rmsConsigneeMapper;
+    @Autowired
+    AmsSaleTrucknoMaterialMapper amsSaleTrucknoMaterialMapper;
 
     /**
      * 查询销售订单
@@ -52,19 +56,25 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public Map<String, Object> getSaleOrder(BigDecimal saleOrderId) {
         List<Map<String,Object>> entries = amsSaleOrderMapper.getMaterialMessages(saleOrderId);
         Map<String,Object> head = amsSaleOrderMapper.getSaleOrderMessage(saleOrderId);
+        // 单价
+        BigDecimal taxPrice = (BigDecimal) head.get("unitPrice");
+        // 税率
+        String taxRate = (String) head.get("tax");
+        // 收款客户
+        String customer = (String) head.get("customer");
         for (Map<String, Object> entry : entries) {
-            BigDecimal qty = null;
-            BigDecimal materialNumber = (BigDecimal) entry.get("materialNumber");
-            BigDecimal materialWeight = (BigDecimal) entry.get("materialWeight");
-            if (materialNumber != null && materialNumber.toString().length() != 0) {
-                qty = materialNumber;
-            }
-            if (materialWeight != null && materialWeight.toString().length() != 0) {
-                qty = materialWeight;
-            }
-            entry.put("qty",qty);
+            BigDecimal stEntryId = (BigDecimal) entry.get("stEntryId");
+            BigDecimal isPoundSale = (BigDecimal) entry.get("isPoundSale");
+            BigDecimal forChangdu = (BigDecimal) entry.get("forChangdu");
+            BigDecimal assistQty = (BigDecimal) entry.get("materialNumber");
+            entry.put("assistQty",assistQty.toString());
             entry.remove("materialNumber");
-            entry.remove("materialWeight");
+            entry.put("taxPrice",taxPrice.toString());
+            entry.put("taxRate",taxRate);
+            entry.put("customer",customer);
+            entry.replace("stEntryId",stEntryId.toString());
+            entry.replace("isPoundSale",isPoundSale.toString());
+            entry.replace("forChangdu", forChangdu == null ? "" : forChangdu.toString());
         }
         Map<String,Object> input = new HashMap<>();
         input.put("head",head);
@@ -190,6 +200,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     Object warehouseNum = materialMap.get("warehouseNum");
                     // 仓库名称
                     Object warehouseName = materialMap.get("warehouseName");
+                    // 物资理重
+                    Object meterWeight = materialMap.get("meterWeight");
                     if (warehouseName != null) {
                         amsSaleMaterial.setSaleWarehouse(warehouseName.toString());
                     }
@@ -206,6 +218,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     amsSaleMaterial.setMaterialId(materialId);
                     amsSaleMaterial.setInsertTime(new Date());
                     amsSaleMaterial.setInsertUsername("金蝶");
+                    amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
                     if (materialUnit.equals("件")) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
@@ -244,28 +257,37 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     Map<String,Object> resultMap = new HashMap<>();
                     resultMap.put("easPrimaryId",easPrimaryId);
                     AmsSaleMaterial amsSaleMaterial;
+                    // 得到物资数量
+                    String materialNumber = (String) materialMap.get("materialNumber");
                     // 如果有物流系统销售订单物资表主键：认定是走物流新增的销售订单（通过物流系统主键进行查询）
                     if (saleMaterialId != null && (!saleMaterialId.equals("null")) && !saleMaterialId.equals("")) {
                         amsSaleMaterial = amsSaleMaterialMapper.selectByPrimaryKey(new BigDecimal(saleMaterialId));
+                        // 同步修改车序号物资表
+                        resultMap.put("materialId",saleMaterialId);
+                        List<AmsSaleTrucknoMaterial> amsSaleTrucknoMaterials = amsSaleTrucknoMaterialMapper.selectByParameters(resultMap);
+                        AmsSaleTrucknoMaterial amsSaleTrucknoMaterial = amsSaleTrucknoMaterials.get(0);
+                        amsSaleTrucknoMaterial.setSaleOrderMaterialNumber(new BigDecimal(materialNumber));
+                        amsSaleTrucknoMaterial.setInsertUpdateRemark("在金蝶做修改");
+                        amsSaleTrucknoMaterialMapper.updateByPrimaryKeySelective(amsSaleTrucknoMaterial);
                     }
                     // 否则认定是走金蝶新增的销售订单（通过金蝶分录id进行查询）
                     else {
                         List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(resultMap);
                         amsSaleMaterial = amsSaleMaterials.get(0);
+                        amsSaleMaterial.setInsertUsername("金蝶");
+                        amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
                     }
                     // 得到物资编码
                     String materialCode = (String) materialMap.get("materialCode");
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);
-                    // 得到物资数量
-                    String materialNumber = (String) materialMap.get("materialNumber");
                     // 得到计量单位
                     String materialUnit = (String) materialMap.get("materialUnit");
+                    Object meterWeight = materialMap.get("meterWeight");
                     amsSaleMaterial.setEasPrimaryId(easPrimaryId);
                     amsSaleMaterial.setSaleOrderId(amsSaleOrder.getSaleOrderId());
                     amsSaleMaterial.setMaterialId(materialId);
                     amsSaleMaterial.setInsertTime(new Date());
-                    amsSaleMaterial.setInsertUsername("金蝶");
-                    amsSaleMaterial.setInsertUpdateRemark("采集金蝶销售订单");
+                    amsSaleMaterial.setMeterWeight(DataChange.dataToBigDecimal(meterWeight));
                     if (materialUnit.equals("件")) {
                         amsSaleMaterial.setMaterialNumber(new BigDecimal(materialNumber));
                     } else {

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

@@ -1,10 +1,15 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.SSOFeign;
+import com.steerinfo.dil.feign.TokenFeign;
 import com.steerinfo.dil.mapper.RmsConsigneeMapper;
 import com.steerinfo.dil.model.RmsConsignee;
 import com.steerinfo.dil.service.IRmsConsigneeService;
+import com.steerinfo.dil.util.HttpUtil;
+import feign.RequestTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -30,6 +35,13 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
     @Autowired
     private RmsConsigneeMapper rmsConsigneeMapper;
 
+    @Autowired
+    SSOFeign ssoFeign;
+
+    @Autowired
+    TokenFeign tokenFeign;
+
+
     /**
      * 管理收货客户
      * @param mapVal
@@ -71,6 +83,24 @@ public class RmsConsigneeServiceImpl implements IRmsConsigneeService {
         rmsConsignee.setUpdateTime(new Date());
         rmsConsignee.setUpdateUsername("admin");
         rmsConsignee.setInsertUpdateRemark("无");
+//        // 调用sso接口
+//        Map<String, Object> tokenMap = tokenFeign.login("admin03", "7c4a8d09ca3762af61e59520943dc26494f8941b");
+//        Map<String,Object> data = (Map<String, Object>) tokenMap.get("data");
+//        String token = (String) data.get("accessToken");
+//        Map<String,Object> headerMap = new HashMap<>();
+//        // 设置token
+//        headerMap.put("Content-type", "application/x-www-form-urlencoded");
+//        headerMap.put("Authorization","Token" + token);
+//        // 传json格式
+////        String json = JSONUtils.toJSONString(ssoMap);
+////        String s = HttpUtil.doJsonPost("https://wl.dasteel.cn:32322/icore.icp.web/pass/v1/sysusers/", json, token);
+//        // 传formData格式--URL?参数&参数
+//        Map<String, Object> resultMap = ssoFeign.addUser(headerMap,consigneeCompanyName, consigneeCompanyName, "shouhuokehu", "收货客户", "506514577756917769", "713710108567277568", "958023746726268928");
+//        System.out.println(resultMap);
+//        // 赋权
+//        String userId = (String) resultMap.get("userId");
+//        Map<String, Object> rolesMap = ssoFeign.addUserroles(userId, consigneeCompanyName, "958038344527384576");
+//        System.out.println(rolesMap);
         int result = 0;
         List<RmsConsignee> rmsRmsConsignees = rmsConsigneeMapper.selectByParameters(map);
         // 新增

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

@@ -19,12 +19,12 @@ public class EASUtil {
     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 password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "1";
     public final String userName = "user";
     // context
-    public final String command = "savePayOtherBill";
+    public final String command = "saveSaleOrderBillHandler";
 
     /**
      * 得到context的map

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

@@ -0,0 +1,106 @@
+package com.steerinfo.dil.util;
+
+import feign.RequestTemplate;
+import org.apache.http.client.ResponseHandler;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.BasicResponseHandler;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2022/3/28 18:05
+ * @Version:V2.0
+ */
+public class HttpUtil {
+    //get请求
+    public static String doGet(String url,String authValue){
+        String result = null;
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        try {
+            HttpGet httpGet = new HttpGet(url);
+            httpGet.setHeader("Content-type", "application/json");
+            httpGet.setHeader("Authorization","Bearer "+authValue);
+            result = httpClient.execute(httpGet, responseHandler);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        finally {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+        }
+        return result ;
+    }
+
+    // post请求参数为json格式
+    public static String doJsonPost(String url, String json,String authValue) {
+        String result = null;
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        ResponseHandler<String> responseHandler = new BasicResponseHandler();
+        try {
+            HttpPost httpPost = new HttpPost(url);
+            StringEntity requestEntity = new StringEntity(json, "utf-8");
+            requestEntity.setContentEncoding("UTF-8");
+            httpPost.setHeader("Content-type", "application/json");
+            httpPost.setHeader("Authorization","Bearer "+authValue);
+            httpPost.setEntity(requestEntity);
+            result = httpClient.execute(httpPost, responseHandler);
+        } catch (Exception e) {
+            System.out.println(e.getMessage());
+        } finally {
+            try {
+                httpClient.close();
+            } catch (Exception e) {
+                System.out.println(e.getMessage());
+            }
+        }
+        return result;
+    }
+
+    public static String mapToTxt(Map<String,Object> fieldMap) throws Exception {
+        Random random = new Random();
+        int j;
+        String getLine = "\r\n";
+        String doubleBar = "--";
+        String biaoshi = "----WebKitFormBoundary";
+        StringBuffer sb = new StringBuffer();
+//        for (int i = 0; i < 16; i++) {
+//            j = random.nextInt(MULTIPART_CHARS.length - 2) + 2;
+//            sb.append(MULTIPART_CHARS[j]);
+//        }
+        biaoshi = biaoshi + sb.toString();
+        StringBuffer stringBuffer = new StringBuffer();
+
+
+        for (Map.Entry<String, Object> entity : fieldMap.entrySet()) {
+            String name = "Content-Disposition: form-data; name=\"" + entity.getKey() + "\"";
+            stringBuffer.append(doubleBar + biaoshi);
+            stringBuffer.append(getLine);
+            stringBuffer.append(name);
+            stringBuffer.append(getLine);
+            stringBuffer.append(getLine);
+            stringBuffer.append(entity.getValue());
+            stringBuffer.append(getLine);
+        }
+        stringBuffer.append(doubleBar+biaoshi+doubleBar);
+        return stringBuffer.toString();
+    }
+
+    public static void apply(RequestTemplate template,String token) {
+        // header添加token
+        template.header("token", token);
+    }
+}

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

@@ -1,8 +1,8 @@
 package com.steerinfo.dil.wsdl;
 
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.wsdl.*;
 
 
 public class TestDG {
@@ -34,34 +34,49 @@ public class TestDG {
 //        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");
+
+        ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);//正式账套
+//        ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);//测试服务器正式账套
+//        ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "zseas85", "L2", 1);//本地远程正式
+//        ServiceInfo service = new ServiceInfo("user", "kduser", "eas", "D001", "L2", 1);//远程测试
+//        service.setServername("172.16.62.243" , "56898");//远程开发机bos地址
+        service.setServername("172.16.33.243" , "8888");//正式服务器
+//        service.setServername("172.16.62.243" , "8888");//测试服务器
 //        service.setServername("172.16.49.135" , "56898");
-//        service.setServername("127.0.0.1" , "56898");
+//        service.setServername("127.0.0.1" , "56898");//本机
 
         long startT = System.currentTimeMillis();
 
+        WSContext wsContext = LoginUtil.doEASLogin(service);
+
+        String sessionId = wsContext.getSessionId();
+        if(null == sessionId) {
+            System.out.println("[error]: 登陆有问题");
+            return;
+        }
+
         try {
             String result = null;
+//            WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
             WSFaceFacadeSrvProxyServiceLocator locator = new WSFaceFacadeSrvProxyServiceLocator();
             String json ="{\n" +
-                    " \"input\":{\n" +
-                    "    \"head\": {\n" +
-                    "        \"cusNum\": \"011600008\",\n" +
-                    "        \"number\": \"WXSDD2021122000010003\",\n" +
-                    "        \"unitName\": \"四川省达州钢铁集团有限责任公司\",\n" +
-                    "        \"bizDate\": \"2021-12-20 21:22:00\",\n" +
-                    "        \"remark\": \"测试数据\"\n" +
-                    "    },\n" +
-                    "    \"entries\": [\n" +
-                    "        {\n" +
-                    "            \"materialName\": \"四级螺纹钢定尺范围\",\n" +
-                    "            \"materialNum\": \"080101010100083\",\n" +
-                    "            \"qty\": 20,\n" +
-                    "            \"saleMaterialId\": 4\n" +
-                    "        }\n" +
-                    "    ]\n" +
-                    "},\n" +
+                    "      \"input\": {\n" +
+                    "          \"head\": {\n" +
+                    "              \"number\":\"9999999\",\n" +
+                    "              \"cusNum\":\"010100001\",\n" +
+                    "            \t\"unitName\":\"四川省达州钢铁集团有限责任公司\",\n" +
+                    "              \"bizDate\": \"2021-11-30\",\n" +
+                    "              \"remark\": \"备注，测试数据请勿审核!影响业务可以删除\"\n" +
+                    "          },\n" +
+                    "          \"entries\": [\n" +
+                    "              {\n" +
+                    "                  \"stEntryId\":\"xxxx-xxx-xx\",\n" +
+                    "                  \"materialNum\":\"080101010100001\",\n" +
+                    "                \t\"materialName\":\"四级螺纹钢定尺9米\",\n" +
+                    "                  \"qty\":\"100\",\n" +
+                    "              }\n" +
+                    "          ]\n" +
+                    "      },\n" +
                     "      \"context\": {\n" +
                     "          \"logError\": true,\n" +
                     "          \"logData\": true\n" +
@@ -73,13 +88,15 @@ public class TestDG {
                     "          \"userName\": \"user\"\n" +
                     "      },\n" +
                     "      \"command\": \"saveSaleOrderBillHandler\"\n" +
-                    "}";
+                    "  }";
+
             String res = locator.getWSFaceFacade().invokeJson(json);
             JSONObject request = JSON.parseObject(res);
             String output = request.getString("output");
             String requestException = request.getString("exception");
             System.out.println("成功："+output);
             System.out.println("失败："+requestException);
+            System.out.println("返回值："+request);
 //            String outResult = FaceEncryptUtil.AES_Decrypt(output, "FXXT");
 //            System.out.println(res);//调用接口后返回的结果数据
 //            System.out.println(outResult);
@@ -88,5 +105,4 @@ public class TestDG {
         }
 
     }
-
 }

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

@@ -1,498 +1,498 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" xmlns:intf="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client.facefacade" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-    <!--WSDL created by Apache Axis version: 1.4
-    Built on Apr 22, 2006 (06:55:48 PDT)-->
-    <wsdl:types>
-        <schema targetNamespace="urn:client.facefacade" xmlns="http://www.w3.org/2001/XMLSchema">
-            <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-            <complexType name="WSInvokeException">
-                <sequence/>
-            </complexType>
-        </schema>
-    </wsdl:types>
+<wsdl:definitions targetNamespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" xmlns:intf="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client.facefacade" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<!--WSDL created by Apache Axis version: 1.4
+Built on Apr 22, 2006 (06:55:48 PDT)-->
+ <wsdl:types>
+  <schema targetNamespace="urn:client.facefacade" xmlns="http://www.w3.org/2001/XMLSchema">
+   <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
+   <complexType name="WSInvokeException">
+    <sequence/>
+   </complexType>
+  </schema>
+ </wsdl:types>
 
-    <wsdl:message name="writeFileJsonResponse">
+   <wsdl:message name="thirdXMLRequest">
 
-        <wsdl:part name="writeFileJsonReturn" type="xsd:string">
+      <wsdl:part name="strRequest" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="readFileXmlRequest">
+   <wsdl:message name="invokeXMLResponse">
 
-        <wsdl:part name="request" type="xsd:string">
+      <wsdl:part name="invokeXMLReturn" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="writeFileJsonRequest">
+   <wsdl:message name="thirdXMLResponse">
 
-        <wsdl:part name="request" type="xsd:string">
+      <wsdl:part name="thirdXMLReturn" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-        <wsdl:part name="fileData" type="xsd:base64Binary">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="writeFileJsonResponse">
 
-    </wsdl:message>
+      <wsdl:part name="writeFileJsonReturn" type="xsd:string">
 
-    <wsdl:message name="thirdJsonResponse">
+      </wsdl:part>
 
-        <wsdl:part name="thirdJsonReturn" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="readFileJsonRequest">
 
-    </wsdl:message>
+      <wsdl:part name="request" type="xsd:string">
 
-    <wsdl:message name="writeFileXmlResponse">
+      </wsdl:part>
 
-        <wsdl:part name="writeFileXmlReturn" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="invokeJsonResponse">
 
-    </wsdl:message>
+      <wsdl:part name="invokeJsonReturn" type="xsd:string">
 
-    <wsdl:message name="thirdXMLRequest">
+      </wsdl:part>
 
-        <wsdl:part name="strRequest" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="thirdJsonRequest">
 
-    </wsdl:message>
+      <wsdl:part name="strRequest" type="xsd:string">
 
-    <wsdl:message name="invokeXMLRequest">
+      </wsdl:part>
 
-        <wsdl:part name="strRequest" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="writeFileJsonRequest">
 
-    </wsdl:message>
+      <wsdl:part name="request" type="xsd:string">
 
-    <wsdl:message name="readFileJsonRequest">
+      </wsdl:part>
 
-        <wsdl:part name="request" type="xsd:string">
+      <wsdl:part name="fileData" type="xsd:base64Binary">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="readFileJsonResponse">
+   <wsdl:message name="WSInvokeException">
 
-        <wsdl:part name="readFileJsonReturn" type="xsd:base64Binary">
+      <wsdl:part name="fault" type="tns1:WSInvokeException">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="thirdXMLResponse">
+   <wsdl:message name="writeFileXmlRequest">
 
-        <wsdl:part name="thirdXMLReturn" type="xsd:string">
+      <wsdl:part name="request" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+      <wsdl:part name="fileData" type="xsd:base64Binary">
 
-    <wsdl:message name="readFileXmlResponse">
+      </wsdl:part>
 
-        <wsdl:part name="readFileXmlReturn" type="xsd:base64Binary">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="readFileXmlRequest">
 
-    </wsdl:message>
+      <wsdl:part name="request" type="xsd:string">
 
-    <wsdl:message name="invokeJsonRequest">
+      </wsdl:part>
 
-        <wsdl:part name="strRequest" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="invokeXMLRequest">
 
-    </wsdl:message>
+      <wsdl:part name="strRequest" type="xsd:string">
 
-    <wsdl:message name="invokeJsonResponse">
+      </wsdl:part>
 
-        <wsdl:part name="invokeJsonReturn" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="writeFileXmlResponse">
 
-    </wsdl:message>
+      <wsdl:part name="writeFileXmlReturn" type="xsd:string">
 
-    <wsdl:message name="invokeXMLResponse">
+      </wsdl:part>
 
-        <wsdl:part name="invokeXMLReturn" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="invokeJsonRequest">
 
-    </wsdl:message>
+      <wsdl:part name="strRequest" type="xsd:string">
 
-    <wsdl:message name="thirdJsonRequest">
+      </wsdl:part>
 
-        <wsdl:part name="strRequest" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="thirdJsonResponse">
 
-    </wsdl:message>
+      <wsdl:part name="thirdJsonReturn" type="xsd:string">
 
-    <wsdl:message name="writeFileXmlRequest">
+      </wsdl:part>
 
-        <wsdl:part name="request" type="xsd:string">
+   </wsdl:message>
 
-        </wsdl:part>
+   <wsdl:message name="readFileJsonResponse">
 
-        <wsdl:part name="fileData" type="xsd:base64Binary">
+      <wsdl:part name="readFileJsonReturn" type="xsd:base64Binary">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="WSInvokeException">
+   <wsdl:message name="readFileXmlResponse">
 
-        <wsdl:part name="fault" type="tns1:WSInvokeException">
+      <wsdl:part name="readFileXmlReturn" type="xsd:base64Binary">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:portType name="WSFaceFacadeSrvProxy">
+   <wsdl:portType name="WSFaceFacadeSrvProxy">
 
-        <wsdl:operation name="invokeJson" parameterOrder="strRequest">
+      <wsdl:operation name="invokeJson" parameterOrder="strRequest">
 
-            <wsdl:input message="impl:invokeJsonRequest" name="invokeJsonRequest">
+         <wsdl:input message="impl:invokeJsonRequest" name="invokeJsonRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:invokeJsonResponse" name="invokeJsonResponse">
+         <wsdl:output message="impl:invokeJsonResponse" name="invokeJsonResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="invokeXML" parameterOrder="strRequest">
+      <wsdl:operation name="invokeXML" parameterOrder="strRequest">
 
-            <wsdl:input message="impl:invokeXMLRequest" name="invokeXMLRequest">
+         <wsdl:input message="impl:invokeXMLRequest" name="invokeXMLRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:invokeXMLResponse" name="invokeXMLResponse">
+         <wsdl:output message="impl:invokeXMLResponse" name="invokeXMLResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="thirdJson" parameterOrder="strRequest">
+      <wsdl:operation name="thirdJson" parameterOrder="strRequest">
 
-            <wsdl:input message="impl:thirdJsonRequest" name="thirdJsonRequest">
+         <wsdl:input message="impl:thirdJsonRequest" name="thirdJsonRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:thirdJsonResponse" name="thirdJsonResponse">
+         <wsdl:output message="impl:thirdJsonResponse" name="thirdJsonResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="thirdXML" parameterOrder="strRequest">
+      <wsdl:operation name="thirdXML" parameterOrder="strRequest">
 
-            <wsdl:input message="impl:thirdXMLRequest" name="thirdXMLRequest">
+         <wsdl:input message="impl:thirdXMLRequest" name="thirdXMLRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:thirdXMLResponse" name="thirdXMLResponse">
+         <wsdl:output message="impl:thirdXMLResponse" name="thirdXMLResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="writeFileJson" parameterOrder="request fileData">
+      <wsdl:operation name="writeFileJson" parameterOrder="request fileData">
 
-            <wsdl:input message="impl:writeFileJsonRequest" name="writeFileJsonRequest">
+         <wsdl:input message="impl:writeFileJsonRequest" name="writeFileJsonRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:writeFileJsonResponse" name="writeFileJsonResponse">
+         <wsdl:output message="impl:writeFileJsonResponse" name="writeFileJsonResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="readFileJson" parameterOrder="request">
+      <wsdl:operation name="readFileJson" parameterOrder="request">
 
-            <wsdl:input message="impl:readFileJsonRequest" name="readFileJsonRequest">
+         <wsdl:input message="impl:readFileJsonRequest" name="readFileJsonRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:readFileJsonResponse" name="readFileJsonResponse">
+         <wsdl:output message="impl:readFileJsonResponse" name="readFileJsonResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="writeFileXml" parameterOrder="request fileData">
+      <wsdl:operation name="writeFileXml" parameterOrder="request fileData">
 
-            <wsdl:input message="impl:writeFileXmlRequest" name="writeFileXmlRequest">
+         <wsdl:input message="impl:writeFileXmlRequest" name="writeFileXmlRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:writeFileXmlResponse" name="writeFileXmlResponse">
+         <wsdl:output message="impl:writeFileXmlResponse" name="writeFileXmlResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="readFileXml" parameterOrder="request">
+      <wsdl:operation name="readFileXml" parameterOrder="request">
 
-            <wsdl:input message="impl:readFileXmlRequest" name="readFileXmlRequest">
+         <wsdl:input message="impl:readFileXmlRequest" name="readFileXmlRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:readFileXmlResponse" name="readFileXmlResponse">
+         <wsdl:output message="impl:readFileXmlResponse" name="readFileXmlResponse">
 
-            </wsdl:output>
+       </wsdl:output>
 
-            <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
+         <wsdl:fault message="impl:WSInvokeException" name="WSInvokeException">
 
-            </wsdl:fault>
+       </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-    </wsdl:portType>
+   </wsdl:portType>
 
-    <wsdl:binding name="WSFaceFacadeSoapBinding" type="impl:WSFaceFacadeSrvProxy">
+   <wsdl:binding name="WSFaceFacadeSoapBinding" type="impl:WSFaceFacadeSrvProxy">
 
-        <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+      <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
 
-        <wsdl:operation name="invokeJson">
+      <wsdl:operation name="invokeJson">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="invokeJsonRequest">
+         <wsdl:input name="invokeJsonRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="invokeJsonResponse">
+         <wsdl:output name="invokeJsonResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="invokeXML">
+      <wsdl:operation name="invokeXML">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="invokeXMLRequest">
+         <wsdl:input name="invokeXMLRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="invokeXMLResponse">
+         <wsdl:output name="invokeXMLResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="thirdJson">
+      <wsdl:operation name="thirdJson">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="thirdJsonRequest">
+         <wsdl:input name="thirdJsonRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="thirdJsonResponse">
+         <wsdl:output name="thirdJsonResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="thirdXML">
+      <wsdl:operation name="thirdXML">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="thirdXMLRequest">
+         <wsdl:input name="thirdXMLRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="thirdXMLResponse">
+         <wsdl:output name="thirdXMLResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="writeFileJson">
+      <wsdl:operation name="writeFileJson">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="writeFileJsonRequest">
+         <wsdl:input name="writeFileJsonRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="writeFileJsonResponse">
+         <wsdl:output name="writeFileJsonResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="readFileJson">
+      <wsdl:operation name="readFileJson">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="readFileJsonRequest">
+         <wsdl:input name="readFileJsonRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="readFileJsonResponse">
+         <wsdl:output name="readFileJsonResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="writeFileXml">
+      <wsdl:operation name="writeFileXml">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="writeFileXmlRequest">
+         <wsdl:input name="writeFileXmlRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="writeFileXmlResponse">
+         <wsdl:output name="writeFileXmlResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-        <wsdl:operation name="readFileXml">
+      <wsdl:operation name="readFileXml">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="readFileXmlRequest">
+         <wsdl:input name="readFileXmlRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.app.face.cd.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="readFileXmlResponse">
+         <wsdl:output name="readFileXmlResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:output>
+         </wsdl:output>
 
-            <wsdl:fault name="WSInvokeException">
+         <wsdl:fault name="WSInvokeException">
 
-                <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-    </wsdl:binding>
+   </wsdl:binding>
 
-    <wsdl:service name="WSFaceFacadeSrvProxyService">
+   <wsdl:service name="WSFaceFacadeSrvProxyService">
 
-        <wsdl:port binding="impl:WSFaceFacadeSoapBinding" name="WSFaceFacade">
+      <wsdl:port binding="impl:WSFaceFacadeSoapBinding" name="WSFaceFacade">
 
-            <wsdlsoap:address location="http://172.16.62.243:56898/ormrpc/services/WSFaceFacade"/>
+         <wsdlsoap:address location="http://172.16.33.111:8888/ormrpc/services/WSFaceFacade"/>
 
-        </wsdl:port>
+      </wsdl:port>
 
-    </wsdl:service>
+   </wsdl:service>
 
 </wsdl:definitions>

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

@@ -33,8 +33,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -50,8 +50,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -67,8 +67,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -84,8 +84,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -103,8 +103,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -120,8 +120,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -139,8 +139,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));
@@ -156,8 +156,8 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         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"),
-                      "dg.WSInvokeException",
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
                      ));

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

@@ -22,7 +22,7 @@ public class WSFaceFacadeSrvProxyServiceLocator extends org.apache.axis.client.S
     }
 
     // Use to get a proxy class for WSFaceFacade
-    private String WSFaceFacade_address = "http://172.16.62.243:56898/ormrpc/services/WSFaceFacade";
+    private String WSFaceFacade_address = "http://172.16.33.111:8888/ormrpc/services/WSFaceFacade";
 
     public String getWSFaceFacadeAddress() {
         return WSFaceFacade_address;
@@ -105,7 +105,7 @@ public class WSFaceFacadeSrvProxyServiceLocator extends org.apache.axis.client.S
     }
 
     public javax.xml.namespace.QName getServiceName() {
-        return new javax.xml.namespace.QName("http://172.16.62.243:56898/ormrpc/services/WSFaceFacade", "WSFaceFacadeSrvProxyService");
+        return new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "WSFaceFacadeSrvProxyService");
     }
 
     private java.util.HashSet ports = null;
@@ -113,7 +113,7 @@ public class WSFaceFacadeSrvProxyServiceLocator extends org.apache.axis.client.S
     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"));
+            ports.add(new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "WSFaceFacade"));
         }
         return ports.iterator();
     }

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

@@ -43,7 +43,7 @@ public class WSInvokeException  extends org.apache.axis.AxisFault  implements ja
         new org.apache.axis.description.TypeDesc(WSInvokeException.class, true);
 
     static {
-        typeDesc.setXmlType(new javax.xml.namespace.QName("urn:client.updaxingmeteringsystemfacade", "WSInvokeException"));
+        typeDesc.setXmlType(new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"));
     }
 
     /**

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

@@ -15,16 +15,20 @@
         <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
         <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
         <result column="SALE_WAREHOUSE" jdbcType="VARCHAR" property="saleWarehouse" />
+        <result column="STEEL_METER" jdbcType="DECIMAL" property="steelMeter" />
+        <result column="IS_POUND_SALE" jdbcType="DECIMAL" property="isPoundSale" />
+        <result column="METER_WEIGHT" jdbcType="DECIMAL" property="meterWeight" />
     </resultMap>
     <sql id="columns">
         SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
     INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    DELETED, SALE_WAREHOUSE
+    DELETED, SALE_WAREHOUSE, STEEL_METER, IS_POUND_SALE, METER_WEIGHT
     </sql>
     <sql id="columns_alias">
         t.SALE_MATERIAL_ID, t.SALE_ORDER_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_NUMBER,
     t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.SALE_WAREHOUSE
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.SALE_WAREHOUSE, t.STEEL_METER, t.IS_POUND_SALE,
+    t.METER_WEIGHT
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMS_SALE_MATERIAL
@@ -73,6 +77,15 @@
             <if test="saleWarehouse != null and saleWarehouse != ''">
                 and SALE_WAREHOUSE = #{saleWarehouse}
             </if>
+            <if test="steelMeter != null">
+                and STEEL_METER = #{steelMeter}
+            </if>
+            <if test="isPoundSale != null">
+                and IS_POUND_SALE = #{isPoundSale}
+            </if>
+            <if test="meterWeight != null">
+                and METER_WEIGHT = #{meterWeight}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -116,6 +129,15 @@
             <if test="saleWarehouse != null and saleWarehouse != ''">
                 and SALE_WAREHOUSE LIKE '%${saleWarehouse}%'
             </if>
+            <if test="steelMeter != null">
+                and STEEL_METER = #{steelMeter}
+            </if>
+            <if test="isPoundSale != null">
+                and IS_POUND_SALE = #{isPoundSale}
+            </if>
+            <if test="meterWeight != null">
+                and METER_WEIGHT = #{meterWeight}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
@@ -161,18 +183,29 @@
         <if test="saleWarehouse != null and saleWarehouse != ''">
             or SALE_WAREHOUSE = #{saleWarehouse}
         </if>
+        <if test="steelMeter != null">
+            or STEEL_METER = #{steelMeter}
+        </if>
+        <if test="isPoundSale != null">
+            or IS_POUND_SALE = #{isPoundSale}
+        </if>
+        <if test="meterWeight != null">
+            or METER_WEIGHT = #{meterWeight}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL (SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID,
                                        MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
                                        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                        UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
-                                       SALE_WAREHOUSE)
+                                       SALE_WAREHOUSE, STEEL_METER, IS_POUND_SALE,
+                                       METER_WEIGHT)
         values (#{saleMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
                 #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL}, #{easPrimaryId,jdbcType=VARCHAR},
                 #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
                 #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
-                #{saleWarehouse,jdbcType=VARCHAR})
+                #{saleWarehouse,jdbcType=VARCHAR}, #{steelMeter,jdbcType=DECIMAL}, #{isPoundSale,jdbcType=DECIMAL},
+                #{meterWeight,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL
@@ -216,6 +249,15 @@
             <if test="saleWarehouse != null">
                 SALE_WAREHOUSE,
             </if>
+            <if test="steelMeter != null">
+                STEEL_METER,
+            </if>
+            <if test="isPoundSale != null">
+                IS_POUND_SALE,
+            </if>
+            <if test="meterWeight != null">
+                METER_WEIGHT,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saleMaterialId != null">
@@ -257,6 +299,15 @@
             <if test="saleWarehouse != null">
                 #{saleWarehouse,jdbcType=VARCHAR},
             </if>
+            <if test="steelMeter != null">
+                #{steelMeter,jdbcType=DECIMAL},
+            </if>
+            <if test="isPoundSale != null">
+                #{isPoundSale,jdbcType=DECIMAL},
+            </if>
+            <if test="meterWeight != null">
+                #{meterWeight,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -272,7 +323,10 @@
             UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
             INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
             DELETED = #{deleted,jdbcType=DECIMAL},
-            SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR}
+            SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR},
+            STEEL_METER = #{steelMeter,jdbcType=DECIMAL},
+            IS_POUND_SALE = #{isPoundSale,jdbcType=DECIMAL},
+            METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL}
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -314,6 +368,15 @@
             <if test="saleWarehouse != null">
                 SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR},
             </if>
+            <if test="steelMeter != null">
+                STEEL_METER = #{steelMeter,jdbcType=DECIMAL},
+            </if>
+            <if test="isPoundSale != null">
+                IS_POUND_SALE = #{isPoundSale,jdbcType=DECIMAL},
+            </if>
+            <if test="meterWeight != null">
+                METER_WEIGHT = #{meterWeight,jdbcType=DECIMAL},
+            </if>
         </set>
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
@@ -337,7 +400,8 @@
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
         INSERT_UPDATE_REMARK, DELETED,
-        SALE_WAREHOUSE)
+        SALE_WAREHOUSE, STEEL_METER, IS_POUND_SALE,
+        METER_WEIGHT)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.saleMaterialId,jdbcType=DECIMAL},
@@ -346,7 +410,8 @@
         #{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.saleWarehouse,jdbcType=VARCHAR} from dual
+        #{item.saleWarehouse,jdbcType=VARCHAR}, #{item.steelMeter,jdbcType=DECIMAL}, #{item.isPoundSale,jdbcType=DECIMAL},
+        #{item.meterWeight,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -404,6 +469,18 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
             when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.saleWarehouse,jdbcType=VARCHAR}
         </foreach>
+        ,STEEL_METER=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.steelMeter,jdbcType=DECIMAL}
+        </foreach>
+        ,IS_POUND_SALE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.isPoundSale,jdbcType=DECIMAL}
+        </foreach>
+        ,METER_WEIGHT=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.meterWeight,jdbcType=DECIMAL}
+        </foreach>
         where SALE_MATERIAL_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.saleMaterialId,jdbcType=DECIMAL}
@@ -418,7 +495,6 @@
     </delete>
     <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <!-- 通过物资编码查询物资id -->
     <select id="getMaterialId" parameterType="java.lang.String" resultType="DECIMAL">
         SELECT RM.MATERIAL_ID AS "materialId"

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

@@ -23,19 +23,21 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="CLOSE_STATUS" jdbcType="DECIMAL" property="closeStatus" />
+    <result column="SALER_ID" jdbcType="DECIMAL" property="salerId" />
   </resultMap>
   <sql id="columns">
-    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
-    SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
-    SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
-    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS
+    SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
+    SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
+    SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
+    SALER_ID
   </sql>
   <sql id="columns_alias">
-    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE, 
-    t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS, 
-    t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX, 
-    t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS
+    t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE,
+    t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS,
+    t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX,
+    t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS, t.SALER_ID
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER
@@ -44,7 +46,7 @@
     SELECT <include refid="columns_alias" /> FROM AMS_SALE_ORDER t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="saleOrderId != null">
         and SALE_ORDER_ID = #{saleOrderId}
       </if>
@@ -108,10 +110,13 @@
       <if test="closeStatus != null">
         and CLOSE_STATUS = #{closeStatus}
       </if>
+      <if test="salerId != null">
+        and SALER_ID = #{salerId}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="saleOrderId != null">
         and SALE_ORDER_ID = #{saleOrderId}
       </if>
@@ -175,6 +180,9 @@
       <if test="closeStatus != null">
         and CLOSE_STATUS = #{closeStatus}
       </if>
+      <if test="salerId != null">
+        and SALER_ID = #{salerId}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -183,87 +191,90 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMS_SALE_ORDER
-    where 1!=1 
-      <if test="planId != null">
-        or PLAN_ID = #{planId}
-      </if>
-      <if test="saleNumber != null and saleNumber != ''">
-        or SALE_NUMBER = #{saleNumber}
-      </if>
-      <if test="shipperId != null">
-        or SHIPPER_ID = #{shipperId}
-      </if>
-      <if test="receiveId != null">
-        or RECEIVE_ID = #{receiveId}
-      </if>
-      <if test="saleAccountBalance != null">
-        or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        or SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
-      </if>
-      <if test="saleHistoricalOrderAmount != null">
-        or SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
-      </if>
-      <if test="saleOrderStatus != null">
-        or SALE_ORDER_STATUS = #{saleOrderStatus}
-      </if>
-      <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
-        or SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
-      </if>
-      <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
-        or SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
-      </if>
-      <if test="saleUnitPrice != null">
-        or SALE_UNIT_PRICE = #{saleUnitPrice}
-      </if>
-      <if test="saleOrderTax != null and saleOrderTax != ''">
-        or SALE_ORDER_TAX = #{saleOrderTax}
-      </if>
-      <if test="saleRemark != null and saleRemark != ''">
-        or SALE_REMARK = #{saleRemark}
-      </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="closeStatus != null">
-        or CLOSE_STATUS = #{closeStatus}
-      </if>
+    where 1!=1
+    <if test="planId != null">
+      or PLAN_ID = #{planId}
+    </if>
+    <if test="saleNumber != null and saleNumber != ''">
+      or SALE_NUMBER = #{saleNumber}
+    </if>
+    <if test="shipperId != null">
+      or SHIPPER_ID = #{shipperId}
+    </if>
+    <if test="receiveId != null">
+      or RECEIVE_ID = #{receiveId}
+    </if>
+    <if test="saleAccountBalance != null">
+      or SALE_ACCOUNT_BALANCE = #{saleAccountBalance}
+    </if>
+    <if test="saleCurrentOrderAmount != null">
+      or SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount}
+    </if>
+    <if test="saleHistoricalOrderAmount != null">
+      or SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount}
+    </if>
+    <if test="saleOrderStatus != null">
+      or SALE_ORDER_STATUS = #{saleOrderStatus}
+    </if>
+    <if test="saleOrderReceiveCustomer != null and saleOrderReceiveCustomer != ''">
+      or SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer}
+    </if>
+    <if test="saleOrderIsselfMention != null and saleOrderIsselfMention != ''">
+      or SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention}
+    </if>
+    <if test="saleUnitPrice != null">
+      or SALE_UNIT_PRICE = #{saleUnitPrice}
+    </if>
+    <if test="saleOrderTax != null and saleOrderTax != ''">
+      or SALE_ORDER_TAX = #{saleOrderTax}
+    </if>
+    <if test="saleRemark != null and saleRemark != ''">
+      or SALE_REMARK = #{saleRemark}
+    </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="closeStatus != null">
+      or CLOSE_STATUS = #{closeStatus}
+    </if>
+    <if test="salerId != null">
+      or SALER_ID = #{salerId}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
-    insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, 
-      SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
-      SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, 
-      SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
-      SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, 
-      SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS
-      )
-    values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR}, 
-      #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL}, 
-      #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL}, 
-      #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR}, 
-      #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL}, 
-      #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{closeStatus,jdbcType=DECIMAL}
-      )
+    insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
+                                SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
+                                SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
+                                SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
+                                SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
+                                SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
+                                INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
+                                SALER_ID)
+    values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
+            #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
+            #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+            #{saleOrderStatus,jdbcType=DECIMAL}, #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+            #{saleOrderIsselfMention,jdbcType=VARCHAR}, #{saleUnitPrice,jdbcType=DECIMAL},
+            #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{closeStatus,jdbcType=DECIMAL},
+            #{salerId,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER
@@ -331,6 +342,9 @@
       <if test="closeStatus != null">
         CLOSE_STATUS,
       </if>
+      <if test="salerId != null">
+        SALER_ID,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderId != null">
@@ -396,30 +410,34 @@
       <if test="closeStatus != null">
         #{closeStatus,jdbcType=DECIMAL},
       </if>
+      <if test="salerId != null">
+        #{salerId,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     update AMS_SALE_ORDER
     set PLAN_ID = #{planId,jdbcType=DECIMAL},
-      SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
-      SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
-      RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
-      SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
-      SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
-      SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
-      SALE_ORDER_STATUS = #{saleOrderStatus,jdbcType=DECIMAL},
-      SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
-      SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention,jdbcType=VARCHAR},
-      SALE_UNIT_PRICE = #{saleUnitPrice,jdbcType=DECIMAL},
-      SALE_ORDER_TAX = #{saleOrderTax,jdbcType=VARCHAR},
-      SALE_REMARK = #{saleRemark,jdbcType=VARCHAR},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL}
+        SALE_NUMBER = #{saleNumber,jdbcType=VARCHAR},
+        SHIPPER_ID = #{shipperId,jdbcType=DECIMAL},
+        RECEIVE_ID = #{receiveId,jdbcType=DECIMAL},
+        SALE_ACCOUNT_BALANCE = #{saleAccountBalance,jdbcType=DECIMAL},
+        SALE_CURRENT_ORDER_AMOUNT = #{saleCurrentOrderAmount,jdbcType=DECIMAL},
+        SALE_HISTORICAL_ORDER_AMOUNT = #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
+        SALE_ORDER_STATUS = #{saleOrderStatus,jdbcType=DECIMAL},
+        SALE_ORDER_RECEIVE_CUSTOMER = #{saleOrderReceiveCustomer,jdbcType=VARCHAR},
+        SALE_ORDER_ISSELF_MENTION = #{saleOrderIsselfMention,jdbcType=VARCHAR},
+        SALE_UNIT_PRICE = #{saleUnitPrice,jdbcType=DECIMAL},
+        SALE_ORDER_TAX = #{saleOrderTax,jdbcType=VARCHAR},
+        SALE_REMARK = #{saleRemark,jdbcType=VARCHAR},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL},
+        SALER_ID = #{salerId,jdbcType=DECIMAL}
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -485,6 +503,9 @@
       <if test="closeStatus != null">
         CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL},
       </if>
+      <if test="salerId != null">
+        SALER_ID = #{salerId,jdbcType=DECIMAL},
+      </if>
     </set>
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
@@ -501,126 +522,132 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMS_SALE_ORDER 
-      (SALE_ORDER_ID, 
-      PLAN_ID, SALE_NUMBER, SHIPPER_ID, 
-      RECEIVE_ID, SALE_ACCOUNT_BALANCE, 
-      SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, 
-      SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER, 
-      SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, 
-      SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, 
-      UPDATE_TIME, INSERT_UPDATE_REMARK, 
-      DELETED, CLOSE_STATUS)
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.saleOrderId,jdbcType=DECIMAL}, 
-      #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL}, 
-      #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL}, 
-      #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}, 
-      #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}, 
-      #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL}, 
-      #{item.saleOrderTax,jdbcType=VARCHAR}, #{item.saleRemark,jdbcType=VARCHAR}, #{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.closeStatus,jdbcType=DECIMAL} from dual  
-   </foreach> )
+    insert into AMS_SALE_ORDER
+    (SALE_ORDER_ID,
+    PLAN_ID, SALE_NUMBER, SHIPPER_ID,
+    RECEIVE_ID, SALE_ACCOUNT_BALANCE,
+    SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT,
+    SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
+    SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE,
+    SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED, CLOSE_STATUS, SALER_ID
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.saleOrderId,jdbcType=DECIMAL},
+    #{item.planId,jdbcType=DECIMAL}, #{item.saleNumber,jdbcType=VARCHAR}, #{item.shipperId,jdbcType=DECIMAL},
+    #{item.receiveId,jdbcType=DECIMAL}, #{item.saleAccountBalance,jdbcType=DECIMAL},
+    #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}, #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL},
+    #{item.saleOrderStatus,jdbcType=DECIMAL}, #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR},
+    #{item.saleOrderIsselfMention,jdbcType=VARCHAR}, #{item.saleUnitPrice,jdbcType=DECIMAL},
+    #{item.saleOrderTax,jdbcType=VARCHAR}, #{item.saleRemark,jdbcType=VARCHAR}, #{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.closeStatus,jdbcType=DECIMAL}, #{item.salerId,jdbcType=DECIMAL}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMS_SALE_ORDER
-     set
-       SALE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
-       </foreach>
-       ,PLAN_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleNumber,jdbcType=VARCHAR}
-       </foreach>
-       ,SHIPPER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
-       </foreach>
-       ,RECEIVE_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ACCOUNT_BALANCE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleAccountBalance,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_CURRENT_ORDER_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_HISTORICAL_ORDER_AMOUNT=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderStatus,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_RECEIVE_CUSTOMER=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_ORDER_ISSELF_MENTION=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderIsselfMention,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_UNIT_PRICE=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleUnitPrice,jdbcType=DECIMAL}
-       </foreach>
-       ,SALE_ORDER_TAX=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderTax,jdbcType=VARCHAR}
-       </foreach>
-       ,SALE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,CLOSE_STATUS=
-       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
-          when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.closeStatus,jdbcType=DECIMAL}
-       </foreach>
-     where SALE_ORDER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.saleOrderId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMS_SALE_ORDER
+    set
+    SALE_ORDER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderId,jdbcType=DECIMAL}
+    </foreach>
+    ,PLAN_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleNumber,jdbcType=VARCHAR}
+    </foreach>
+    ,SHIPPER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.shipperId,jdbcType=DECIMAL}
+    </foreach>
+    ,RECEIVE_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.receiveId,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ACCOUNT_BALANCE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleAccountBalance,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_CURRENT_ORDER_AMOUNT=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleCurrentOrderAmount,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_HISTORICAL_ORDER_AMOUNT=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleHistoricalOrderAmount,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ORDER_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ORDER_RECEIVE_CUSTOMER=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderReceiveCustomer,jdbcType=VARCHAR}
+    </foreach>
+    ,SALE_ORDER_ISSELF_MENTION=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderIsselfMention,jdbcType=VARCHAR}
+    </foreach>
+    ,SALE_UNIT_PRICE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleUnitPrice,jdbcType=DECIMAL}
+    </foreach>
+    ,SALE_ORDER_TAX=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleOrderTax,jdbcType=VARCHAR}
+    </foreach>
+    ,SALE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,CLOSE_STATUS=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.closeStatus,jdbcType=DECIMAL}
+    </foreach>
+    ,SALER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.salerId,jdbcType=DECIMAL}
+    </foreach>
+    where SALE_ORDER_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.saleOrderId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMS_SALE_ORDER
-    where SALE_ORDER_ID in 
+    where SALE_ORDER_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
@@ -629,26 +656,38 @@
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 得到销售订单信息 -->
   <select id="getSaleOrderMessage" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT ASO.SALE_NUMBER   AS "number",
-           RC.CONSIGNEE_CODE AS "cusNum",
-           RSH.SHIPPER_NAME  AS "unitName",
-           ASO.INSERT_TIME   AS "bizDate",
-           ASO.SALE_REMARK   AS "remark"
+    SELECT ASO.SALE_NUMBER                                                  AS "number",
+           RC.CONSIGNEE_CODE                                                AS "cusNum",
+           RSH.SHIPPER_NAME                                                 AS "unitName",
+           ASO.INSERT_TIME                                                  AS "bizDate",
+           ASO.SALE_REMARK                                                  AS "remark",
+           DECODE(ASO.SALE_ORDER_ISSELF_MENTION, '是', 'CARRY', '否', 'SEND') AS "sendType",
+           ASO.SALE_UNIT_PRICE                                              AS "unitPrice",
+           DECODE(ASO.SALE_ORDER_TAX, '13%', '13')                          AS "tax",
+           ASO.SALE_ORDER_RECEIVE_CUSTOMER                                  AS "customer",
+           RS.SALER_CODE                                                    AS "person",
+           RSA.AREA_CODE                                                    AS "saleGroup"
     FROM AMS_SALE_ORDER ASO
            LEFT JOIN RMS_CONSIGNEE RC
                      ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+           LEFT JOIN RMS_SALE_AREA RSA
+                     ON RSA.AREA_ID = RC.AREA_ID
            LEFT JOIN RMS_SHIPPER RSH
                      ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+           LEFT JOIN RMS_SALER RS
+                     ON RS.SALER_ID = ASO.SALER_ID
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
   <!-- 得到订单下的物资信息 -->
   <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
-    SELECT RM.MATERIAL_CODE          AS "materialNum",
-           ASM.MATERIAL_WEIGHT       AS "materialWeight",
-           ASM.MATERIAL_NUMBER       AS "materialNumber",
-           RM.MATERIAL_NAME          AS "materialName",
-           ASM.SALE_MATERIAL_ID      AS "saleMaterialId"
+    SELECT RM.MATERIAL_CODE     AS "materialNum",
+           ASM.MATERIAL_WEIGHT  AS "materialWeight",
+           ASM.MATERIAL_NUMBER  AS "materialNumber",
+           RM.MATERIAL_NAME     AS "materialName",
+           ASM.SALE_MATERIAL_ID AS "stEntryId",
+           ASM.IS_POUND_SALE    AS "isPoundSale",
+           ASM.STEEL_METER      AS "forChangdu"
     FROM AMS_SALE_MATERIAL ASM
            LEFT JOIN RMS_MATERIAL RM
                      ON RM.MATERIAL_ID = ASM.MATERIAL_ID

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

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

src/main/test/com/test/Test2.java

@@ -1,161 +0,0 @@
-package com.test;
-
-import com.steerinfo.dil.util.Log4jUtils;
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.encoding.XMLType;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.XMLWriter;
-import org.hibernate.mapping.Array;
-import org.junit.Test;
-
-import javax.xml.rpc.ParameterMode;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
-/**
- * @ author    :TXF
- * @ time      :2022/2/10 11:05
- */
-
-public class Test2 {
-    @Test
-    public void test() {
-        try {
-            // 创建一个Document实例
-            Document doc = DocumentHelper.createDocument();
-
-            // 添加根节点
-            Element root = doc.addElement("root");
-
-            // 在根节点下添加第一个子节点
-            Element oneChildElement = root.addElement("person").addAttribute("attr", "root noe");
-            oneChildElement.addElement("people")
-                    .addAttribute("attr", "child one")
-                    .addText("person one child one");
-            oneChildElement.addElement("people")
-                    .addAttribute("attr", "child two")
-                    .addText("person one child two");
-
-            // 在根节点下添加第一个子节点
-            Element twoChildElement = root.addElement("person").addAttribute("attr", "root two");
-            twoChildElement.addElement("people")
-                    .addAttribute("attr", "child one")
-                    .addText("person two child one");
-            twoChildElement.addElement("people")
-                    .addAttribute("attr", "child two")
-                    .addText("person two child two");
-
-            // xml格式化样式
-            // OutputFormat format = OutputFormat.createPrettyPrint(); // 默认样式
-
-            // 自定义xml样式
-            OutputFormat format = new OutputFormat();
-            format.setIndentSize(2);  // 行缩进
-            format.setNewlines(true); // 一个结点为一行
-            format.setTrimText(true); // 去重空格
-            format.setPadText(true);
-            format.setNewLineAfterDeclaration(false); // 放置xml文件中第二行为空白行
-            System.out.println(doc.asXML());
-            // 输出xml文件
-            XMLWriter writer = new XMLWriter(new FileOutputStream("E:\\asd.xml"), format);
-            writer.write(doc);
-            System.out.println("dom4j CreateDom4j success!");
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static String asXmlDate(List<String> dataList) {
-        // 创建一个Document实例
-        Document doc = DocumentHelper.createDocument();
-        // 添加根节点
-        Element table = doc.addElement("table");
-        //添加第子节点
-        table.addElement("rowCount").addText("1");
-        table.addElement("headCount").addText("9");
-        Element head = table.addElement("head");
-        //添加body下的r1下的子节点
-        Element r1 = table.addElement("body").addElement("r1");
-        //添加head的子节点
-        for (int i = 0; i < dataList.size(); i++) {
-            head.addElement("h" + (i + 1)).addText(dataList.get(i));
-            r1.addElement("r1c" + (i + 1)).addText(dataList.get(i));
-        }
-        return doc.asXML();
-    }
-
-    public static String invokRemoveWSDLByAxis(String reqXML, String endPoint) {
-        String responseXML = "";
-        Service service = new Service();
-        try {
-            Call call = (Call) service.createCall();
-            call.setTargetEndpointAddress(endPoint);
-            call.setOperationName(new javax.xml.namespace.QName("http://webservice.app.facade.jjboom.custom.eas.kingdee.com", "transferEASInterfaceMethod"));
-            call.addParameter("username", XMLType.XSD_STRING, ParameterMode.IN);
-            call.setReturnType(XMLType.XSD_STRING);
-            responseXML = (String) call.invoke(new Object[]{reqXML, "weighSoucNew"});
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return responseXML;
-    }
-
-    @Test
-    public void test4() {
-        ArrayList<String> list = new ArrayList<>();
-        for (int i = 1; i < 10; i++) {
-            list.add(i + "");
-        }
-        String testXml = asXmlDate(list);
-        System.out.println(testXml);
-    }
-
-    @Test
-    public void test5(){
-        // 创建一个Document实例
-        Document doc = DocumentHelper.createDocument();
-        // 添加根节点
-        Element requests = null;
-        try {
-            requests = doc.addElement("requests");
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        //添加第子节点
-        Element request = requests.addElement("request");
-        request.addElement("TypeID").addText("PUR");               //采购订单类型
-        request.addElement("FNumber").addText("1");              //磅单号
-        request.addElement("FBizDate").addText("2");             // 净重时间
-        request.addElement("Carnumber").addText("3");            //车牌号
-        request.addElement("FTransportOrgID").addText("4");
-        request.addElement("FGrossScaleID").addText("1");        //毛重汽车衡
-        request.addElement("FTareScaleID").addText("1");         //皮重汽车衡
-        request.addElement("FGrossWeight").addText("1");         //毛重时间
-        request.addElement("FTareWeight").addText("1");          //皮重
-        request.addElement("FGrossPoundTime").addText("1");      //毛重时间
-        request.addElement("FTarePoundTime").addText("1");       //皮重时间
-        request.addElement("FSourceBillID").addText("1");        //采购订单号
-        request.addElement("FSourceBillEntryID").addText("1");   //分录ID
-        request.addElement("FNetWeight").addText("1");           //净重
-        request.addElement("FIncidental").addText("0");         //扣杂
-        request.addElement("FLastNetWeight").addText("1");     //最后净重
-        request.addElement("FDescription").addText("");       //备注
-
-        System.out.println(doc.asXML());
-
-    }
-}

src/main/test/test23.java

@@ -1,77 +0,0 @@
-import com.steerinfo.dil.util.Log4jUtils;
-import org.apache.axis.client.Call;
-import org.apache.axis.client.Service;
-import org.apache.axis.encoding.XMLType;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.junit.Test;
-import sun.reflect.CallerSensitive;
-
-import javax.xml.rpc.ParameterMode;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ author    :TXF
- * @ time      :2022/2/10 16:36
- */
-
-public class test23 {
-    public static void main(String[] args) {
-        ArrayList<String> list = new ArrayList<>();
-        for (int i = 1; i < 10; i++) {
-            list.add(i + "");
-        }
-        String testXml = asXmlDate(list);
-        String url = "http://172.16.62.243:56898/ormrpc/services/WSJJBoomFacade";
-        String s = invokRemoveWSDLByAxis(testXml, url);
-        System.out.println(s);
-    }
-
-    public static String asXmlDate(List<String> dataList){
-        // 创建一个Document实例
-        Document doc = DocumentHelper.createDocument();
-        // 添加根节点
-        Element table = doc.addElement("table");
-        //添加第子节点
-        table.addElement("rowCount").addText("1");
-        table.addElement("headCount").addText("9");
-        Element head = table.addElement("head");
-        //添加body下的r1下的子节点
-        Element r1 = table.addElement("body").addElement("r1");
-        //添加head的子节点
-        for (int i = 0; i < dataList.size(); i++) {
-            head.addElement("h" + (i + 1)).addText(dataList.get(i));
-            r1.addElement("r1c" + (i + 1)).addText(dataList.get(i));
-        }
-        return doc.asXML();
-    }
-
-    public static String invokRemoveWSDLByAxis(String reqXML, String endPoint) {
-        String responseXML = "";
-        Service service = new Service();
-        try {
-            Call call = (Call) service.createCall();
-            call.setTargetEndpointAddress(endPoint);
-            call.setOperationName(new javax.xml.namespace.QName("WSJJBoomFacade"));
-            call.addParameter("arg0", XMLType.XSD_STRING, ParameterMode.IN);
-            call.setReturnType(XMLType.XSD_STRING);
-            responseXML = (String) call.invoke(new Object[] { reqXML });
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return responseXML;
-    }
-
-
-    @Test
-    public void test2(){
-        String str = "123123我要成功";
-        if("成功".equals(str.substring(str.length() - 2))){
-            System.out.println("success");
-        }else {
-            System.out.println("failed");
-        }
-    }
-}