Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API into dev

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

@@ -3,6 +3,7 @@ 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.service.impl.AmsNotUploadedEasServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.SaleUtil;
 import com.steerinfo.dil.wsdl.ServiceInfo;
@@ -28,6 +29,9 @@ public class WSFaceController extends BaseRESTfulController {
     @Autowired
     SaleUtil saleUtil;
 
+    @Autowired
+    AmsNotUploadedEasServiceImpl amsNotUploadedEasService;
+
     @PostMapping("/pushBmsSettlement")
     @ApiModelProperty(value = "结算金蝶访问接口")
     public String WSFaceWay(@RequestBody Map<String,Object> map) {
@@ -69,4 +73,9 @@ public class WSFaceController extends BaseRESTfulController {
         }
         return output;
     }
+
+    @PostMapping("asd")
+    public void asd(){
+        amsNotUploadedEasService.makeXmlFile();
+    }
 }

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

@@ -16,4 +16,7 @@ public interface AmsNotUploadedEasMapper extends IBaseMapper<AmsNotUploadedEas,
 
     //查询所有未上传金蝶的数据  补传
     List<Map<String, Object>> getAllNotUploadedEasMes();
+
+    //模拟采购报文
+    List<Map<String, Object>> asd();
 }

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

@@ -8,10 +8,15 @@ import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightResult, BigDecimal> {
 
+    //查询最大主键Id
+    @Select("select seq_tmstruck_weight_result.nextval from dual")
+    BigDecimal selectMaxId();
+
     // 得到计重实绩主键id
     BigDecimal getWeightTaskResultId(Map<String,Object>mapValue);
 
@@ -31,6 +36,9 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
     //通过运输订单号 查询实绩Id、总实绩ID
     Map<String, Object> selectTotalIdByOrderNo(Map<String, Object> map);
 
+    //通过运输订单号 和物资ID 查询实绩ID
+    Map<String, Object> selectResultIdByOrderNoAndMaterialId(Map<String, Object> map);
+
     //通过汽车衡编号查询汽车衡ID
     Integer selectTruckCalculateId(String truckCalculateNumber);
 

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

@@ -29,6 +29,7 @@ public interface UtilsMapper {
 
     //通过运输Id 或者运输订单号修改 路段顺序号
     int updateLineSeqByOrderIdOrNum(Map<String, Object> map);
+    int updateLineSeqByOrderIdOrNum2(Map<String, Object> map);
 
     //通过运力ID 或车牌号 修改运力状态
     int updateCapacityByCarIdOrNum(Map<String, Object> map);
@@ -60,9 +61,16 @@ public interface UtilsMapper {
     //通过总实绩ID查找订单类型
     Integer getOrderTypeByTotalId(BigDecimal resultTotalId);
 
+    //通过运输订单号查询运输订单类型
+    Map<String, Object> getOrderTypeByOrderNumber(String orderNumber);
+
     //查询最大路段顺序号 以及当前订单路段顺序号（执行到哪一步）
     Map<String, Object> getLineSeqAndOrderSeq(Map<String, Object> map);
 
     //查询订单是否已经签收过
     Integer checkoutReceipt(String orderNumber);
+
+    //通过订单号查询订单路段顺序号
+    Integer getLineSequenceByOrderNumber(String orderNumber);
+
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -21,7 +22,7 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     private BigDecimal resultTotalId;
 
     /**
-     * 磅单号(RESULT_POUND_NO,VARCHAR,20)
+     * 磅单号(RESULT_POUND_NO,VARCHAR,100)
      */
     @ApiModelProperty(value="磅单号",required=false)
     private String resultPoundNo;
@@ -128,6 +129,18 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="是否完成扣水扣杂(0:否，1：是)",required=false)
     private BigDecimal isquality;
 
+    /**
+     * 毛重路段顺序号(GROSS_SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="毛重路段顺序号",required=false)
+    private BigDecimal grossSegmentSqe;
+
+    /**
+     * 皮重路段顺序号(TARE_SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="皮重路段顺序号",required=false)
+    private BigDecimal tareSegmentSqe;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -300,6 +313,22 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.isquality = isquality;
     }
 
+    public BigDecimal getGrossSegmentSqe() {
+        return grossSegmentSqe;
+    }
+
+    public void setGrossSegmentSqe(BigDecimal grossSegmentSqe) {
+        this.grossSegmentSqe = grossSegmentSqe;
+    }
+
+    public BigDecimal getTareSegmentSqe() {
+        return tareSegmentSqe;
+    }
+
+    public void setTareSegmentSqe(BigDecimal tareSegmentSqe) {
+        this.tareSegmentSqe = tareSegmentSqe;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -326,6 +355,8 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         sb.append(", materialId=").append(materialId);
         sb.append(", isdeduct=").append(isdeduct);
         sb.append(", isquality=").append(isquality);
+        sb.append(", grossSegmentSqe=").append(grossSegmentSqe);
+        sb.append(", tareSegmentSqe=").append(tareSegmentSqe);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,128 @@
+package com.steerinfo.dil.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.mapper.AmsNotUploadedEasMapper;
+import com.steerinfo.dil.wsdl.LoginUtil;
+import com.steerinfo.dil.wsdl.ServiceInfo;
+import com.steerinfo.dil.wsdl.WSContext;
+import com.steerinfo.dil.wsdl.WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2022/2/16 17:28
+ */
+
+@Service
+public class AmsNotUploadedEasServiceImpl {
+
+    @Autowired
+    AmsNotUploadedEasMapper amsNotUploadedEasMapper;
+
+    /**
+     * 模拟采购报文
+     * @Author TXF
+     * @Date 2022/2/15 19:11
+     * @param
+     * @return
+     **/
+    public void makeXmlFile(){
+        List<Map<String, Object>> asd = amsNotUploadedEasMapper.asd();
+        int i = 1;
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (Map<String, Object> map : asd) {
+            if(map.get("resultTareWeightTime") != null)
+                map.put("resultTareWeightTime",sdf.format(map.get("resultTareWeightTime")));
+            if(map.get("resultCrossWeightTime") != null)
+                map.put("resultCrossWeightTime",sdf.format(map.get("resultCrossWeightTime")));
+//            map.put("No", "PO2021013615");
+//            map.put("easEntryId", "YANhW8BARA+c4oqKXy0/YiYEHMU=");
+            String xml = asXmlData(map);
+            sendMesToKD(xml);
+            System.out.println(i++);
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+//            System.out.println(xml);
+        }
+    }
+
+    /**
+     * 创建计量数据 金蝶xml格式字符串
+     * @Author TXF
+     * @Date 2022/2/10 17:32
+     * @param map
+     * @return
+     **/
+    public String asXmlData(Map<String, Object> map){
+        // 创建一个Document实例
+        Document doc = DocumentHelper.createDocument();
+        // 添加根节点
+        Element requests = doc.addElement("requests");
+        //添加第子节点
+        Element request = requests.addElement("request");
+        request.addElement("TypeID").addText("PUR");               //采购订单类型
+        request.addElement("FNumber").addText((String) map.get("resultPoundNo"));              //磅单号
+        request.addElement("FBizDate").addText((String) map.get("resultTareWeightTime"));             // 净重时间
+        request.addElement("Carnumber").addText((String) map.get("capacityNumber"));            //车牌号
+        request.addElement("FTransportOrgID").addText("");                          //运输单位
+        request.addElement("FGrossScaleID").addText((String) map.get("resultCrossCalculateNumber"));        //毛重汽车衡
+        request.addElement("FTareScaleID").addText((String) map.get("resultTareCalculateNumber"));         //皮重汽车衡
+        request.addElement("FGrossWeight").addText(String.valueOf(map.get("resultCrossWeight")));         //毛重
+        request.addElement("FTareWeight").addText(String.valueOf(map.get("resultTareWeight")));          //皮重
+        request.addElement("FGrossPoundTime").addText((String) map.get("resultCrossWeightTime"));      //毛重时间
+        request.addElement("FTarePoundTime").addText((String) map.get("resultTareWeightTime"));       //皮重时间
+        request.addElement("FSourceBillID").addText((String) map.get("No"));        //采购订单号
+        request.addElement("FSourceBillEntryID").addText((String) map.get("easEntryId"));   //分录ID
+        request.addElement("FNetWeight").addText(String.valueOf( map.get("resultNetWeight")));           //净重
+        request.addElement("FIncidental").addText("0");         //扣杂
+        request.addElement("FLastNetWeight").addText(String.valueOf(map.get("resultNetWeight")));     //最后净重
+        request.addElement("FDescription").addText("");       //备注
+        return doc.asXML();
+    }
+
+
+    /**
+     *
+     * 推送数据给金蝶接口
+     * @Author TXF
+     * @Date 2022/2/10 17:16
+     * @param xml 报文
+     * @return Integer   1 成功  0 失败
+     **/
+    public int sendMesToKD(String xml){
+        try {
+            System.out.println(xml);
+            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);
+            service.setServername("172.16.62.243" , "8888");
+            WSContext wsContext = LoginUtil.doEASLogin(service);
+            String sessionId = wsContext.getSessionId();
+            if(null == sessionId) {
+                System.out.println("[error]: 登陆有问题");
+                return 0;
+            }
+            WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator locator = new WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator();
+            String res = locator.getWSUpDaxingMeteringSystemFacade().saveWeighBill(xml);
+            Map returnMap = JSON.parseObject(res, Map.class);
+            if("S02".equals(String.valueOf(returnMap.get("Status")))){
+                return 1;
+            }else {
+                System.out.println(xml + "推送失败");
+                return 0;
+            }
+        } catch (Exception e) {
+            System.out.println(xml + "数据推送金蝶失败：" + e.getMessage());
+            return 0;
+        }
+    }
+}

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

@@ -41,8 +41,8 @@ public class KDWebServiceServiceImpl {
         try {
             String xml = asXmlData(map);
             System.out.println(xml);
-            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);
-            service.setServername("172.16.62.243" , "8888");
+            ServiceInfo service = new ServiceInfo("user", "dgjt@kingdee", "eas", "FDDGEAS85", "L2", 1);
+            service.setServername("172.16.33.111" , "8888");//正式服务器
             WSContext wsContext = LoginUtil.doEASLogin(service);
             String sessionId = wsContext.getSessionId();
             if(null == sessionId) {
@@ -53,11 +53,15 @@ public class KDWebServiceServiceImpl {
             WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator locator = new WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator();
             String res = locator.getWSUpDaxingMeteringSystemFacade().saveWeighBill(xml);
             Map returnMap = JSON.parseObject(res, Map.class);
-            if("S02".equals(String.valueOf(returnMap.get("Status")))){
+            String status = String.valueOf(returnMap.get("Status"));
+            if("S02".equals(status)){
                 return 1;
+            }else if ("S03".equals(status)){
+                System.out.println((map.get("orderNumber")  + "数据推送金蝶失败：" + res));
+                return 0;
             }else {
                 addNotUploadedEASResult(map);
-                System.out.println((map.get("orderNumber")+ "数据推送金蝶失败："+ returnMap.get("MessageText")));
+                System.out.println((map.get("orderNumber") + "数据推送金蝶失败："+ returnMap.get("MessageText")));
                 return 0;
             }
         } catch (Exception e) {

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

@@ -119,6 +119,15 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     public String addTruckWeightResult(Map<String, Object> map) {
+        //首先通过运输订单号查询订单类型
+        Map<String, Object> oneMap = utilsMapper.getOrderTypeByOrderNumber((String) map.get("orderNumber")); //用于判断订单类型
+        if(oneMap == null){
+            return map.get("orderNumber") + "系统无此订单";
+        }
+        Integer orderType= DataChange.dataToBigDecimal(oneMap.get("orderType")).intValue();
+        if(orderType == 11){
+            return insertWeightResultBy11(map, oneMap);
+        }
         //通过运输订单号查询计量实绩Id
         Map<String, Object> stringObjectMap = tmstruckWeightResultMapper.selectWeightIdByOrderId(map);
         if(stringObjectMap == null){
@@ -138,8 +147,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //如果含有这个变量则代表是老区订单需要判断是否回传给金蝶
         if(map.get("needCheckToKD") != null){
             if(map.get("resultNetWeight") != null){
-                Integer orderType = DataChange.dataToBigDecimal(stringObjectMap.get("orderTypee")).intValue();
-                if ( orderType == 6) {
+                Object resultCrossWeightTime = map.get("resultCrossWeightTime");
+                if ( orderType == 6 && resultCrossWeightTime != null && !"".equals(resultCrossWeightTime)) {
                     String resultNetWeight = String.valueOf(map.get("resultNetWeight")); //如果净重不为空  或者净重不为0
                     if (!"null".equals(resultNetWeight) && !"".equals(resultNetWeight) && !"0".equals(resultNetWeight)) {
                         //回传数据给金蝶方法
@@ -362,6 +371,64 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
     }
 
+    /**
+     * 纯内转订单类型
+     * @Author TXF
+     * @Date 2022/2/18 9:55
+     * @param map
+     * @return
+     **/
+    public String insertWeightResultBy11(Map<String, Object> map, Map<String, Object> oneMap){
+        TmstruckWeightResult tmstruckWeightResult = new TmstruckWeightResult();
+        tmstruckWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
+        tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        Integer sqe = DataChange.dataToBigDecimal(oneMap.get("Sqe")).intValue(); //获取订单路段顺序号
+        sqe = sqe + 1;
+        Map<String, Object> threeMap = new HashMap<>(); //用于更新路段顺序号
+        threeMap.put("orderLineSequence", sqe);
+        threeMap.put("orderNumber", map.get("orderNumber"));
+        utilsMapper.updateLineSeqByOrderIdOrNum2(threeMap); //更新订单路段顺序号
+        //首先查询这个订单号的这个物资ID是否有计量实绩
+        Map<String, Object> twoMap = tmstruckWeightResultMapper.selectResultIdByOrderNoAndMaterialId(map); //判断这个物资是否已经计量过
+        Object resultCrossWeightTime = map.get("resultCrossWeightTime");
+        if(twoMap == null){//如果查出来为空，则进行新增操作
+            tmstruckWeightResult.setId(tmstruckWeightResultMapper.selectMaxId()); //新增主键
+            tmstruckWeightResult.setResultTotalId(DataChange.dataToBigDecimal(oneMap.get("totalId"))); //新增总实绩ID
+            if(resultCrossWeightTime == null || "".equals(String.valueOf(resultCrossWeightTime))){//只有一条数据的情况
+                tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(sqe));
+            }
+            else {
+                tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(sqe));
+                tmstruckWeightResult.setGrossSegmentSqe(new BigDecimal(sqe));
+            }
+            try {
+                addWeightResult(tmstruckWeightResult, map);
+            } catch (Exception e) {
+                return e.getMessage();
+            }
+            tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult); //新增计量实绩
+        }else {
+            //如果不为空则证明进行过至少一次计量
+            tmstruckWeightResult.setId(DataChange.dataToBigDecimal(twoMap.get("weightTaskResultId")));
+            //取出计量数据与传进来的毛皮数据进行对比
+            BigDecimal inTareWeight = DataChange.dataToBigDecimal(twoMap.get("resultTareWeight"));
+            if(inTareWeight.compareTo(DataChange.dataToBigDecimal(map.get("resultTareWeight"))) > 0){
+                //如果取出来的皮重 大于 传进来的皮重   则需要调换路段顺序号
+                tmstruckWeightResult.setGrossSegmentSqe(DataChange.dataToBigDecimal(twoMap.get("tareSegmentSqe")));
+                tmstruckWeightResult.setTareSegmentSqe(new BigDecimal(sqe));
+            }
+            try {
+                addWeightResult(tmstruckWeightResult, map);
+            } catch (Exception e) {
+                return e.getMessage();
+            }
+            tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+        }
+        //推送数据
+        utilsService.pushMesToWebsocket((String) oneMap.get("capacityNumber"), "计量");
+        return map.get("orderNumber") + "成功";
+    }
+
     /**
      * 添加火车计量实绩
      * @param map

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.62.243:56898/ormrpc/services/EASLogin" xmlns:intf="http://172.16.62.243:56898/ormrpc/services/EASLogin" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<wsdl:definitions targetNamespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.33.111:8888/ormrpc/services/EASLogin" xmlns:intf="http://172.16.33.111:8888/ormrpc/services/EASLogin" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client" 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>
@@ -18,7 +18,23 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
   </schema>
  </wsdl:types>
 
-   <wsdl:message name="loginRequest2">
+   <wsdl:message name="loginResponse">
+
+      <wsdl:part name="loginReturn" type="tns1:WSContext">
+
+      </wsdl:part>
+
+   </wsdl:message>
+
+   <wsdl:message name="logoutResponse">
+
+      <wsdl:part name="logoutReturn" type="xsd:boolean">
+
+      </wsdl:part>
+
+   </wsdl:message>
+
+   <wsdl:message name="loginRequest">
 
       <wsdl:part name="userName" type="xsd:string">
 
@@ -48,6 +64,10 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       </wsdl:part>
 
+      <wsdl:part name="isEncodePwd" type="xsd:int">
+
+      </wsdl:part>
+
    </wsdl:message>
 
    <wsdl:message name="loginResponse1">
@@ -58,16 +78,12 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
    </wsdl:message>
 
-   <wsdl:message name="loginRequest">
+   <wsdl:message name="logoutRequest">
 
       <wsdl:part name="userName" type="xsd:string">
 
       </wsdl:part>
 
-      <wsdl:part name="password" type="xsd:string">
-
-      </wsdl:part>
-
       <wsdl:part name="slnName" type="xsd:string">
 
       </wsdl:part>
@@ -80,27 +96,23 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       </wsdl:part>
 
-      <wsdl:part name="dbType" type="xsd:int">
-
-      </wsdl:part>
-
-      <wsdl:part name="authPattern" type="xsd:string">
+   </wsdl:message>
 
-      </wsdl:part>
+   <wsdl:message name="loginResponse2">
 
-      <wsdl:part name="isEncodePwd" type="xsd:int">
+      <wsdl:part name="loginReturn" type="tns1:WSContext">
 
       </wsdl:part>
 
    </wsdl:message>
 
-   <wsdl:message name="loginRequest1">
+   <wsdl:message name="loginByLtpaTokenRequest">
 
       <wsdl:part name="userName" type="xsd:string">
 
       </wsdl:part>
 
-      <wsdl:part name="password" type="xsd:string">
+      <wsdl:part name="ltpaToken" type="xsd:string">
 
       </wsdl:part>
 
@@ -122,29 +134,13 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
    </wsdl:message>
 
-   <wsdl:message name="loginResponse">
-
-      <wsdl:part name="loginReturn" type="tns1:WSContext">
-
-      </wsdl:part>
-
-   </wsdl:message>
-
-   <wsdl:message name="loginByLtpaTokenResponse">
-
-      <wsdl:part name="loginByLtpaTokenReturn" type="tns1:WSContext">
-
-      </wsdl:part>
-
-   </wsdl:message>
-
-   <wsdl:message name="loginByLtpaTokenRequest">
+   <wsdl:message name="loginRequest1">
 
       <wsdl:part name="userName" type="xsd:string">
 
       </wsdl:part>
 
-      <wsdl:part name="ltpaToken" type="xsd:string">
+      <wsdl:part name="password" type="xsd:string">
 
       </wsdl:part>
 
@@ -164,22 +160,22 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       </wsdl:part>
 
-   </wsdl:message>
-
-   <wsdl:message name="logoutResponse">
-
-      <wsdl:part name="logoutReturn" type="xsd:boolean">
+      <wsdl:part name="authPattern" type="xsd:string">
 
       </wsdl:part>
 
    </wsdl:message>
 
-   <wsdl:message name="logoutRequest">
+   <wsdl:message name="loginRequest2">
 
       <wsdl:part name="userName" type="xsd:string">
 
       </wsdl:part>
 
+      <wsdl:part name="password" type="xsd:string">
+
+      </wsdl:part>
+
       <wsdl:part name="slnName" type="xsd:string">
 
       </wsdl:part>
@@ -192,11 +188,15 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       </wsdl:part>
 
+      <wsdl:part name="dbType" type="xsd:int">
+
+      </wsdl:part>
+
    </wsdl:message>
 
-   <wsdl:message name="loginResponse2">
+   <wsdl:message name="loginByLtpaTokenResponse">
 
-      <wsdl:part name="loginReturn" type="tns1:WSContext">
+      <wsdl:part name="loginByLtpaTokenReturn" type="tns1:WSContext">
 
       </wsdl:part>
 
@@ -204,25 +204,25 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
    <wsdl:portType name="EASLoginProxy">
 
-      <wsdl:operation name="login" parameterOrder="userName password slnName dcName language dbType authPattern isEncodePwd">
+      <wsdl:operation name="loginByLtpaToken" parameterOrder="userName ltpaToken slnName dcName language dbType">
 
-         <wsdl:input message="impl:loginRequest" name="loginRequest">
+         <wsdl:input message="impl:loginByLtpaTokenRequest" name="loginByLtpaTokenRequest">
 
        </wsdl:input>
 
-         <wsdl:output message="impl:loginResponse" name="loginResponse">
+         <wsdl:output message="impl:loginByLtpaTokenResponse" name="loginByLtpaTokenResponse">
 
        </wsdl:output>
 
       </wsdl:operation>
 
-      <wsdl:operation name="login" parameterOrder="userName password slnName dcName language dbType">
+      <wsdl:operation name="login" parameterOrder="userName password slnName dcName language dbType authPattern isEncodePwd">
 
-         <wsdl:input message="impl:loginRequest1" name="loginRequest1">
+         <wsdl:input message="impl:loginRequest" name="loginRequest">
 
        </wsdl:input>
 
-         <wsdl:output message="impl:loginResponse1" name="loginResponse1">
+         <wsdl:output message="impl:loginResponse" name="loginResponse">
 
        </wsdl:output>
 
@@ -230,35 +230,35 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       <wsdl:operation name="login" parameterOrder="userName password slnName dcName language dbType authPattern">
 
-         <wsdl:input message="impl:loginRequest2" name="loginRequest2">
+         <wsdl:input message="impl:loginRequest1" name="loginRequest1">
 
        </wsdl:input>
 
-         <wsdl:output message="impl:loginResponse2" name="loginResponse2">
+         <wsdl:output message="impl:loginResponse1" name="loginResponse1">
 
        </wsdl:output>
 
       </wsdl:operation>
 
-      <wsdl:operation name="logout" parameterOrder="userName slnName dcName language">
+      <wsdl:operation name="login" parameterOrder="userName password slnName dcName language dbType">
 
-         <wsdl:input message="impl:logoutRequest" name="logoutRequest">
+         <wsdl:input message="impl:loginRequest2" name="loginRequest2">
 
        </wsdl:input>
 
-         <wsdl:output message="impl:logoutResponse" name="logoutResponse">
+         <wsdl:output message="impl:loginResponse2" name="loginResponse2">
 
        </wsdl:output>
 
       </wsdl:operation>
 
-      <wsdl:operation name="loginByLtpaToken" parameterOrder="userName ltpaToken slnName dcName language dbType">
+      <wsdl:operation name="logout" parameterOrder="userName slnName dcName language">
 
-         <wsdl:input message="impl:loginByLtpaTokenRequest" name="loginByLtpaTokenRequest">
+         <wsdl:input message="impl:logoutRequest" name="logoutRequest">
 
        </wsdl:input>
 
-         <wsdl:output message="impl:loginByLtpaTokenResponse" name="loginByLtpaTokenResponse">
+         <wsdl:output message="impl:logoutResponse" name="logoutResponse">
 
        </wsdl:output>
 
@@ -270,19 +270,19 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
 
-      <wsdl:operation name="login">
+      <wsdl:operation name="loginByLtpaToken">
 
          <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="loginRequest">
+         <wsdl:input name="loginByLtpaTokenRequest">
 
             <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://login.webservice.bos.kingdee.com" use="encoded"/>
 
          </wsdl:input>
 
-         <wsdl:output name="loginResponse">
+         <wsdl:output name="loginByLtpaTokenResponse">
 
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" use="encoded"/>
 
          </wsdl:output>
 
@@ -292,15 +292,15 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
          <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="loginRequest1">
+         <wsdl:input name="loginRequest">
 
             <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://login.webservice.bos.kingdee.com" use="encoded"/>
 
          </wsdl:input>
 
-         <wsdl:output name="loginResponse1">
+         <wsdl:output name="loginResponse">
 
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" use="encoded"/>
 
          </wsdl:output>
 
@@ -310,51 +310,51 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
          <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="loginRequest2">
+         <wsdl:input name="loginRequest1">
 
             <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://login.webservice.bos.kingdee.com" use="encoded"/>
 
          </wsdl:input>
 
-         <wsdl:output name="loginResponse2">
+         <wsdl:output name="loginResponse1">
 
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" use="encoded"/>
 
          </wsdl:output>
 
       </wsdl:operation>
 
-      <wsdl:operation name="logout">
+      <wsdl:operation name="login">
 
          <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="logoutRequest">
+         <wsdl:input name="loginRequest2">
 
             <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://login.webservice.bos.kingdee.com" use="encoded"/>
 
          </wsdl:input>
 
-         <wsdl:output name="logoutResponse">
+         <wsdl:output name="loginResponse2">
 
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" use="encoded"/>
 
          </wsdl:output>
 
       </wsdl:operation>
 
-      <wsdl:operation name="loginByLtpaToken">
+      <wsdl:operation name="logout">
 
          <wsdlsoap:operation soapAction=""/>
 
-         <wsdl:input name="loginByLtpaTokenRequest">
+         <wsdl:input name="logoutRequest">
 
             <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://login.webservice.bos.kingdee.com" use="encoded"/>
 
          </wsdl:input>
 
-         <wsdl:output name="loginByLtpaTokenResponse">
+         <wsdl:output name="logoutResponse">
 
-            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:56898/ormrpc/services/EASLogin" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/EASLogin" use="encoded"/>
 
          </wsdl:output>
 
@@ -366,7 +366,7 @@ Built on Apr 22, 2006 (06:55:48 PDT)-->
 
       <wsdl:port binding="impl:EASLoginSoapBinding" name="EASLogin">
 
-         <wsdlsoap:address location="http://172.16.62.243:56898/ormrpc/services/EASLogin"/>
+         <wsdlsoap:address location="http://172.16.33.111:8888/ormrpc/services/EASLogin"/>
 
       </wsdl:port>
 

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

@@ -8,9 +8,9 @@
 package com.steerinfo.dil.wsdl;
 
 public interface EASLoginProxy extends java.rmi.Remote {
+    public WSContext loginByLtpaToken(String userName, String ltpaToken, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException;
     public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType, String authPattern, int isEncodePwd) throws java.rmi.RemoteException;
-    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException;
     public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType, String authPattern) throws java.rmi.RemoteException;
+    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException;
     public boolean logout(String userName, String slnName, String dcName, String language) throws java.rmi.RemoteException;
-    public WSContext loginByLtpaToken(String userName, String ltpaToken, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException;
 }

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

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

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

@@ -24,10 +24,10 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         org.apache.axis.description.OperationDesc oper;
         org.apache.axis.description.ParameterDesc param;
         oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("login");
+        oper.setName("loginByLtpaToken");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "userName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "password"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "ltpaToken"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "slnName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
@@ -37,13 +37,9 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dbType"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "authPattern"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
-        oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isEncodePwd"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
-        oper.addParameter(param);
         oper.setReturnType(new javax.xml.namespace.QName("urn:client", "WSContext"));
         oper.setReturnClass(WSContext.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("", "loginReturn"));
+        oper.setReturnQName(new javax.xml.namespace.QName("", "loginByLtpaTokenReturn"));
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         _operations[0] = oper;
@@ -62,6 +58,10 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dbType"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
         oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "authPattern"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "isEncodePwd"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
+        oper.addParameter(param);
         oper.setReturnType(new javax.xml.namespace.QName("urn:client", "WSContext"));
         oper.setReturnClass(WSContext.class);
         oper.setReturnQName(new javax.xml.namespace.QName("", "loginReturn"));
@@ -93,39 +93,39 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         _operations[2] = oper;
 
         oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("logout");
+        oper.setName("login");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "userName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "password"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
+        oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "slnName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dcName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "language"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
-        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
-        oper.setReturnClass(boolean.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("", "logoutReturn"));
+        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dbType"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
+        oper.addParameter(param);
+        oper.setReturnType(new javax.xml.namespace.QName("urn:client", "WSContext"));
+        oper.setReturnClass(WSContext.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "loginReturn"));
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         _operations[3] = oper;
 
         oper = new org.apache.axis.description.OperationDesc();
-        oper.setName("loginByLtpaToken");
+        oper.setName("logout");
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "userName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "ltpaToken"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
-        oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "slnName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dcName"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
         param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "language"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "string"), String.class, false, false);
         oper.addParameter(param);
-        param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("", "dbType"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "int"), int.class, false, false);
-        oper.addParameter(param);
-        oper.setReturnType(new javax.xml.namespace.QName("urn:client", "WSContext"));
-        oper.setReturnClass(WSContext.class);
-        oper.setReturnQName(new javax.xml.namespace.QName("", "loginByLtpaTokenReturn"));
+        oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "boolean"));
+        oper.setReturnClass(boolean.class);
+        oper.setReturnQName(new javax.xml.namespace.QName("", "logoutReturn"));
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         _operations[4] = oper;
@@ -235,7 +235,7 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         }
     }
 
-    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType, String authPattern, int isEncodePwd) throws java.rmi.RemoteException {
+    public WSContext loginByLtpaToken(String userName, String ltpaToken, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {
             throw new org.apache.axis.NoEndPointException();
         }
@@ -244,11 +244,11 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         _call.setUseSOAPAction(true);
         _call.setSOAPActionURI("");
         _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "login"));
+        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "loginByLtpaToken"));
 
         setRequestHeaders(_call);
         setAttachments(_call);
- try {        Object _resp = _call.invoke(new Object[] {userName, password, slnName, dcName, language, new Integer(dbType), authPattern, new Integer(isEncodePwd)});
+ try {        Object _resp = _call.invoke(new Object[] {userName, ltpaToken, slnName, dcName, language, new Integer(dbType)});
 
         if (_resp instanceof java.rmi.RemoteException) {
             throw (java.rmi.RemoteException)_resp;
@@ -266,7 +266,7 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
 }
     }
 
-    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException {
+    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType, String authPattern, int isEncodePwd) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {
             throw new org.apache.axis.NoEndPointException();
         }
@@ -279,7 +279,7 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
 
         setRequestHeaders(_call);
         setAttachments(_call);
- try {        Object _resp = _call.invoke(new Object[] {userName, password, slnName, dcName, language, new Integer(dbType)});
+ try {        Object _resp = _call.invoke(new Object[] {userName, password, slnName, dcName, language, new Integer(dbType), authPattern, new Integer(isEncodePwd)});
 
         if (_resp instanceof java.rmi.RemoteException) {
             throw (java.rmi.RemoteException)_resp;
@@ -328,7 +328,7 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
 }
     }
 
-    public boolean logout(String userName, String slnName, String dcName, String language) throws java.rmi.RemoteException {
+    public WSContext login(String userName, String password, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {
             throw new org.apache.axis.NoEndPointException();
         }
@@ -337,11 +337,11 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         _call.setUseSOAPAction(true);
         _call.setSOAPActionURI("");
         _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "logout"));
+        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "login"));
 
         setRequestHeaders(_call);
         setAttachments(_call);
- try {        Object _resp = _call.invoke(new Object[] {userName, slnName, dcName, language});
+ try {        Object _resp = _call.invoke(new Object[] {userName, password, slnName, dcName, language, new Integer(dbType)});
 
         if (_resp instanceof java.rmi.RemoteException) {
             throw (java.rmi.RemoteException)_resp;
@@ -349,9 +349,9 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         else {
             extractAttachments(_call);
             try {
-                return ((Boolean) _resp).booleanValue();
+                return (WSContext) _resp;
             } catch (Exception _exception) {
-                return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue();
+                return (WSContext) org.apache.axis.utils.JavaUtils.convert(_resp, WSContext.class);
             }
         }
   } catch (org.apache.axis.AxisFault axisFaultException) {
@@ -359,7 +359,7 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
 }
     }
 
-    public WSContext loginByLtpaToken(String userName, String ltpaToken, String slnName, String dcName, String language, int dbType) throws java.rmi.RemoteException {
+    public boolean logout(String userName, String slnName, String dcName, String language) throws java.rmi.RemoteException {
         if (super.cachedEndpoint == null) {
             throw new org.apache.axis.NoEndPointException();
         }
@@ -368,11 +368,11 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         _call.setUseSOAPAction(true);
         _call.setSOAPActionURI("");
         _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
-        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "loginByLtpaToken"));
+        _call.setOperationName(new javax.xml.namespace.QName("http://login.webservice.bos.kingdee.com", "logout"));
 
         setRequestHeaders(_call);
         setAttachments(_call);
- try {        Object _resp = _call.invoke(new Object[] {userName, ltpaToken, slnName, dcName, language, new Integer(dbType)});
+ try {        Object _resp = _call.invoke(new Object[] {userName, slnName, dcName, language});
 
         if (_resp instanceof java.rmi.RemoteException) {
             throw (java.rmi.RemoteException)_resp;
@@ -380,9 +380,9 @@ public class EASLoginSoapBindingStub extends org.apache.axis.client.Stub impleme
         else {
             extractAttachments(_call);
             try {
-                return (WSContext) _resp;
+                return ((Boolean) _resp).booleanValue();
             } catch (Exception _exception) {
-                return (WSContext) org.apache.axis.utils.JavaUtils.convert(_resp, WSContext.class);
+                return ((Boolean) org.apache.axis.utils.JavaUtils.convert(_resp, boolean.class)).booleanValue();
             }
         }
   } catch (org.apache.axis.AxisFault axisFaultException) {

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

@@ -1,98 +1,98 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" xmlns:intf="http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client.updaxingmeteringsystemfacade" 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.updaxingmeteringsystemfacade" 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/WSUpDaxingMeteringSystemFacade" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:impl="http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" xmlns:intf="http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:tns1="urn:client.updaxingmeteringsystemfacade" 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.updaxingmeteringsystemfacade" 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="WSInvokeException">
+   <wsdl:message name="saveWeighBillRequest">
 
-        <wsdl:part name="fault" type="tns1:WSInvokeException">
+      <wsdl:part name="requests" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="saveWeighBillResponse">
+   <wsdl:message name="saveWeighBillResponse">
 
-        <wsdl:part name="saveWeighBillReturn" type="xsd:string">
+      <wsdl:part name="saveWeighBillReturn" type="xsd:string">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:message name="saveWeighBillRequest">
+   <wsdl:message name="WSInvokeException">
 
-        <wsdl:part name="requests" type="xsd:string">
+      <wsdl:part name="fault" type="tns1:WSInvokeException">
 
-        </wsdl:part>
+      </wsdl:part>
 
-    </wsdl:message>
+   </wsdl:message>
 
-    <wsdl:portType name="WSUpDaxingMeteringSystemFacadeSrvProxy">
+   <wsdl:portType name="WSUpDaxingMeteringSystemFacadeSrvProxy">
 
-        <wsdl:operation name="saveWeighBill" parameterOrder="requests">
+      <wsdl:operation name="saveWeighBill" parameterOrder="requests">
 
-            <wsdl:input message="impl:saveWeighBillRequest" name="saveWeighBillRequest">
+         <wsdl:input message="impl:saveWeighBillRequest" name="saveWeighBillRequest">
 
-            </wsdl:input>
+       </wsdl:input>
 
-            <wsdl:output message="impl:saveWeighBillResponse" name="saveWeighBillResponse">
+         <wsdl:output message="impl:saveWeighBillResponse" name="saveWeighBillResponse">
 
-            </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="WSUpDaxingMeteringSystemFacadeSoapBinding" type="impl:WSUpDaxingMeteringSystemFacadeSrvProxy">
+   <wsdl:binding name="WSUpDaxingMeteringSystemFacadeSoapBinding" type="impl:WSUpDaxingMeteringSystemFacadeSrvProxy">
 
-        <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="saveWeighBill">
+      <wsdl:operation name="saveWeighBill">
 
-            <wsdlsoap:operation soapAction=""/>
+         <wsdlsoap:operation soapAction=""/>
 
-            <wsdl:input name="saveWeighBillRequest">
+         <wsdl:input name="saveWeighBillRequest">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.weight.daxing.custom.eas.kingdee.com" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://webservice.weight.daxing.custom.eas.kingdee.com" use="encoded"/>
 
-            </wsdl:input>
+         </wsdl:input>
 
-            <wsdl:output name="saveWeighBillResponse">
+         <wsdl:output name="saveWeighBillResponse">
 
-                <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" use="encoded"/>
+            <wsdlsoap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" 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:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" use="encoded"/>
+            <wsdlsoap:fault encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" name="WSInvokeException" namespace="http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade" use="encoded"/>
 
-            </wsdl:fault>
+         </wsdl:fault>
 
-        </wsdl:operation>
+      </wsdl:operation>
 
-    </wsdl:binding>
+   </wsdl:binding>
 
-    <wsdl:service name="WSUpDaxingMeteringSystemFacadeSrvProxyService">
+   <wsdl:service name="WSUpDaxingMeteringSystemFacadeSrvProxyService">
 
-        <wsdl:port binding="impl:WSUpDaxingMeteringSystemFacadeSoapBinding" name="WSUpDaxingMeteringSystemFacade">
+      <wsdl:port binding="impl:WSUpDaxingMeteringSystemFacadeSoapBinding" name="WSUpDaxingMeteringSystemFacade">
 
-            <wsdlsoap:address location="http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade"/>
+         <wsdlsoap:address location="http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade"/>
 
-        </wsdl:port>
+      </wsdl:port>
 
-    </wsdl:service>
+   </wsdl:service>
 
 </wsdl:definitions>

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

@@ -33,7 +33,7 @@ public class WSUpDaxingMeteringSystemFacadeSoapBindingStub extends org.apache.ax
         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:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "fault"),
                       "WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.updaxingmeteringsystemfacade", "WSInvokeException"), 
                       true

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

@@ -22,7 +22,7 @@ public class WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator extends org.ap
     }
 
     // Use to get a proxy class for WSUpDaxingMeteringSystemFacade
-    private String WSUpDaxingMeteringSystemFacade_address = "http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade";
+    private String WSUpDaxingMeteringSystemFacade_address = "http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade";
 
     public String getWSUpDaxingMeteringSystemFacadeAddress() {
         return WSUpDaxingMeteringSystemFacade_address;
@@ -105,7 +105,7 @@ public class WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator extends org.ap
     }
 
     public javax.xml.namespace.QName getServiceName() {
-        return new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "WSUpDaxingMeteringSystemFacadeSrvProxyService");
+        return new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "WSUpDaxingMeteringSystemFacadeSrvProxyService");
     }
 
     private java.util.HashSet ports = null;
@@ -113,7 +113,7 @@ public class WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocator extends org.ap
     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:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "WSUpDaxingMeteringSystemFacade"));
+            ports.add(new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSUpDaxingMeteringSystemFacade", "WSUpDaxingMeteringSystemFacade"));
         }
         return ports.iterator();
     }

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

@@ -549,4 +549,78 @@
   </select>
 
 
+  <!--   模拟采购报文 -->
+  <select id="asd" resultType="java.util.LinkedHashMap">
+    select
+      OO.ORDER_NUMBER            "orderNumber",
+      RC.CAPACITY_NUMBER         "capacityNumber",
+      TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+      TWR.RESULT_NET_WEIGHT      "resultNetWeight",
+      TWR.RESULT_GROSS_WEIGHT    "resultCrossWeight",
+      TWR.RESULT_TARE_WEIGHT     "resultTareWeight",
+      TWR.RESULT_POUND_NO      "resultPoundNo",
+      TQR.RESULT_DEDUCTION       "resultDeduction",
+      TUR.RESULT_END_TIME        "resultEndTime",
+      RW.WAREHOUSE_NAME          "warehouseName",
+      TRR.INSERT_TIME            "insertTime",
+      TLFR.RESULT_OUT_GATE_TIME  "resultOutGateTime",
+      OO.INSERT_TIME             "insertTimee",
+      RGEN.GATEPOST_NAME         "enGatepostName",
+      RGOUT.GATEPOST_NAME        "outGatepostName",
+      RTCMAO.TRUCK_CALCULATE_NUMBER  "resultCrossCalculateNumber",
+      RTCPI.TRUCK_CALCULATE_NUMBER   "resultTareCalculateNumber",
+      TWR.RESULT_GROSS_WEIGHT_TIME   "resultCrossWeightTime",
+      RM.MATERIAL_NAME                     "materialName",
+      CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode",
+      APO.PURCHASE_ORDER_NO      "No",
+      APO.EAS_ENTRY_ID         "easEntryId",
+      RS.SUPPLIER_NAME           "supplierName",
+      RCON.CONSIGNEE_COMPANY_NAME "receiveName",
+      TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
+    from OMSTRUCK_ORDER OO
+           left join TMSTRUCK_TOTAL_RESULT TTR
+                     on TTR.ORDER_ID = OO.ORDER_ID
+           left join RMS_CAPACITY RC
+                     on RC.CAPACITY_ID = OO.CAPACITY_ID
+           left join TMSTRUCK_ENFACTORY_RESULT TER
+                     on TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+           left join RMS_GATEPOST RGEN      --进厂门岗
+                     on RGEN.GATEPOST_ID = TER.GATEPOST_ID
+           left join OMSTRUCK_ORDER_MATERIAL OOM
+                     on OOM.ORDER_ID = OO.ORDER_ID
+           left join RMS_MATERIAL RM
+                     on RM.MATERIAL_ID = OOM.MATERIAL_ID
+           left join TMSTRUCK_WEIGHT_RESULT TWR
+                     on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+           left join RMS_TRUCK_CALCULATE RTCMAO --毛重汽车衡
+                     on RTCMAO.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+           left join RMS_TRUCK_CALCULATE RTCPI  --皮重汽车衡
+                     on RTCPI.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+           left join TMSTRUCK_UNLOAD_RESULT TUR
+                     on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+           left join RMS_WAREHOUSE RW
+                     on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+           left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                     on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+           left join RMS_GATEPOST RGOUT  --出厂门岗
+                     on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
+           left join TMSTRUCK_RECEIPT_RESULT TRR
+                     on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+           left join TMSTRUCK_QUALITY_RESULT TQR
+                     on TQR.TOTAL_RESULT_ID = TTR.RESULT_TOTAL_ID
+           left join AMS_PURCHASE_ORDER APO
+                     on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+           left join RMS_SUPPLIER RS
+                     on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+           left join RMS_CONSIGNEE RCON
+                     on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+
+    where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
+      and OO.ORDER_TYPE = 6
+      and TWR.RESULT_TARE_WEIGHT_TIME is not null
+      and TWR.RESULT_POUND_NO > 'DX220216090605'
+      and TWR.RESULT_POUND_NO &lt; 'DX220216155301'
+    order by TWR.RESULT_POUND_NO
+  </select>
+
 </mapper>

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

@@ -22,25 +22,28 @@
         <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
         <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
         <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
+        <result column="GROSS_SEGMENT_SQE" jdbcType="DECIMAL" property="grossSegmentSqe" />
+        <result column="TARE_SEGMENT_SQE" jdbcType="DECIMAL" property="tareSegmentSqe" />
     </resultMap>
     <sql id="columns">
         WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
     RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME,
-    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY
+    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE,
+    TARE_SEGMENT_SQE
     </sql>
     <sql id="columns_alias">
         t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT,
     t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT, t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT,
     t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
     t.DELETE_NAME, t.DELETE_TIME, t.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID, t.MATERIAL_ID,
-    t.ISDEDUCT, t.ISQUALITY
+    t.ISDEDUCT, t.ISQUALITY, t.GROSS_SEGMENT_SQE, t.TARE_SEGMENT_SQE
     </sql>
     <sql id="select">
-        SELECT <include refid="columns" /> FROM TMSTRUCK_WEIGHT_RESULT
+        SELECT <include refid="columns"/> FROM TMSTRUCK_WEIGHT_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM TMSTRUCK_WEIGHT_RESULT t
+        SELECT <include refid="columns_alias"/> FROM TMSTRUCK_WEIGHT_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -104,6 +107,12 @@
             <if test="isquality != null">
                 and ISQUALITY = #{isquality}
             </if>
+            <if test="grossSegmentSqe != null">
+                and GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+            </if>
+            <if test="tareSegmentSqe != null">
+                and TARE_SEGMENT_SQE = #{tareSegmentSqe}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -168,9 +177,15 @@
             <if test="isquality != null">
                 and ISQUALITY = #{isquality}
             </if>
+            <if test="grossSegmentSqe != null">
+                and GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+            </if>
+            <if test="tareSegmentSqe != null">
+                and TARE_SEGMENT_SQE = #{tareSegmentSqe}
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
         delete from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </delete>
@@ -234,6 +249,12 @@
         <if test="isquality != null">
             or ISQUALITY = #{isquality}
         </if>
+        <if test="grossSegmentSqe != null">
+            or GROSS_SEGMENT_SQE = #{grossSegmentSqe}
+        </if>
+        <if test="tareSegmentSqe != null">
+            or TARE_SEGMENT_SQE = #{tareSegmentSqe}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         insert into TMSTRUCK_WEIGHT_RESULT (WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID,
@@ -243,7 +264,8 @@
                                             UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                             DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
                                             RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT,
-                                            ISQUALITY)
+                                            ISQUALITY, GROSS_SEGMENT_SQE, TARE_SEGMENT_SQE
+        )
         values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
                 #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL}, #{resultGrossWeightTime,jdbcType=TIMESTAMP},
                 #{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP},
@@ -251,7 +273,8 @@
                 #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{resultGrossPlaceId,jdbcType=DECIMAL},
                 #{resultTarePlaceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{isdeduct,jdbcType=DECIMAL},
-                #{isquality,jdbcType=DECIMAL})
+                #{isquality,jdbcType=DECIMAL}, #{grossSegmentSqe,jdbcType=DECIMAL}, #{tareSegmentSqe,jdbcType=DECIMAL}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         insert into TMSTRUCK_WEIGHT_RESULT
@@ -316,6 +339,12 @@
             <if test="isquality != null">
                 ISQUALITY,
             </if>
+            <if test="grossSegmentSqe != null">
+                GROSS_SEGMENT_SQE,
+            </if>
+            <if test="tareSegmentSqe != null">
+                TARE_SEGMENT_SQE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="weightTaskResultId != null">
@@ -378,6 +407,12 @@
             <if test="isquality != null">
                 #{isquality,jdbcType=DECIMAL},
             </if>
+            <if test="grossSegmentSqe != null">
+                #{grossSegmentSqe,jdbcType=DECIMAL},
+            </if>
+            <if test="tareSegmentSqe != null">
+                #{tareSegmentSqe,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -400,7 +435,9 @@
             RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
             MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
             ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
-            ISQUALITY = #{isquality,jdbcType=DECIMAL}
+            ISQUALITY = #{isquality,jdbcType=DECIMAL},
+            GROSS_SEGMENT_SQE = #{grossSegmentSqe,jdbcType=DECIMAL},
+            TARE_SEGMENT_SQE = #{tareSegmentSqe,jdbcType=DECIMAL}
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -463,20 +500,26 @@
             <if test="isquality != null">
                 ISQUALITY = #{isquality,jdbcType=DECIMAL},
             </if>
+            <if test="grossSegmentSqe != null">
+                GROSS_SEGMENT_SQE = #{grossSegmentSqe,jdbcType=DECIMAL},
+            </if>
+            <if test="tareSegmentSqe != null">
+                TARE_SEGMENT_SQE = #{tareSegmentSqe,jdbcType=DECIMAL},
+            </if>
         </set>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
-        <include refid="select" />
+    <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+        <include refid="select"/>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="where" />
+        <include refid="select"/>
+        <include refid="where"/>
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select" />
-        <include refid="whereLike" />
+        <include refid="select"/>
+        <include refid="whereLike"/>
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into TMSTRUCK_WEIGHT_RESULT
@@ -489,7 +532,8 @@
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
         RESULT_TARE_PLACE_ID, MATERIAL_ID,
-        ISDEDUCT, ISQUALITY)
+        ISDEDUCT, ISQUALITY, GROSS_SEGMENT_SQE,
+        TARE_SEGMENT_SQE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.weightTaskResultId,jdbcType=DECIMAL},
@@ -501,101 +545,110 @@
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
         #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultGrossPlaceId,jdbcType=DECIMAL},
         #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
-        #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL} from dual
+        #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, #{item.grossSegmentSqe,jdbcType=DECIMAL},
+        #{item.tareSegmentSqe,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update TMSTRUCK_WEIGHT_RESULT
         set
         WEIGHT_TASK_RESULT_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.weightTaskResultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_POUND_NO=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_GROSS_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_GROSS_WEIGHT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_TARE_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_WEIGHT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_NET_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_GROSS_PLACE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_PLACE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
         </foreach>
         ,MATERIAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
         </foreach>
         ,ISDEDUCT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
         </foreach>
         ,ISQUALITY=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
         </foreach>
+        ,GROSS_SEGMENT_SQE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.grossSegmentSqe,jdbcType=DECIMAL}
+        </foreach>
+        ,TARE_SEGMENT_SQE=
+        <foreach collection="list" item="item" index="index" separator=" " open="case WEIGHT_TASK_RESULT_ID" close="end">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.tareSegmentSqe,jdbcType=DECIMAL}
+        </foreach>
         where WEIGHT_TASK_RESULT_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item.weightTaskResultId,jdbcType=DECIMAL}
         </foreach>
     </update>
     <delete id="batchDelete" parameterType="java.util.List">
         delete from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID in
-        <foreach close=")" collection="list" item="id" open="(" separator=",">
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -724,7 +777,6 @@
                         OO.ORDER_TYPE             "orderTypee",
                         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
                         TTR.RESULT_TOTAL_ID       "resultTotalId",
-                        RC.CAPACITY_NUMBER        "capacityNumber",
                         TWR.TARE_SEGMENT_SQE      "tareSegmentSqe",
                         TWR.GROSS_SEGMENT_SQE     "grossSegmentSqe"
 
@@ -733,8 +785,6 @@
                                     on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
                           left join OMSTRUCK_ORDER OO
                                     on OO.ORDER_ID = TTR.ORDER_ID
-                          left join RMS_CAPACITY RC
-                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
                  where OO.ORDER_NUMBER = #{orderNumber}
                    and TWR.RESULT_NET_WEIGHT is null
                  order by "tareSegmentSqe"
@@ -785,4 +835,18 @@
         WHERE
             OO.ORDER_NUMBER = #{orderNumber}
     </select>
+
+    <select id="selectResultIdByOrderNoAndMaterialId" parameterType="map" resultType="java.util.Map">
+        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+               TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
+               TWR.TARE_SEGMENT_SQE         "tareSegmentSqe"
+        from OMSTRUCK_ORDER OO
+            left join TMSTRUCK_TOTAL_RESULT TTR
+                on TTR.ORDER_ID = OO.ORDER_ID
+            left join TMSTRUCK_WEIGHT_RESULT TWR
+                on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        where TWR.RESULT_NET_WEIGHT is null
+              and OO.ORDER_NUMBER = #{orderNumber}
+              and TWR.MATERIAL_ID = #{materialId}
+    </select>
 </mapper>

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

@@ -37,6 +37,12 @@
         where OO.ORDER_ID = #{orderId}
     </update>
 
+    <update id="updateLineSeqByOrderIdOrNum2" parameterType="java.util.Map">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_LINE_SEQUENCE = #{orderLineSequence}
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </update>
+
 <!--   通过仓库名称查询仓库Id -->
     <select id="queryWarehouseIdByName" parameterType="string" resultType="java.lang.Integer">
         select RW.WAREHOUSE_ID
@@ -147,4 +153,23 @@
             on TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         where OO.ORDER_NUMBER = #{orderNumber} and TRR.status = 1
     </select>
+
+    <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">
+        select OO.ORDER_LINE_SEQUENCE
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <select id="getOrderTypeByOrderNumber" parameterType="string" resultType="map">
+        select OO.ORDER_TYPE "orderType",
+               TTR.RESULT_TOTAL_ID  "totalId",
+               Rc.CAPACITY_NUMBER   "capacityNumber",
+               OO.ORDER_LINE_SEQUENCE   "Sqe"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where  OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>