add

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

@@ -73,13 +73,12 @@ public class WSFaceController extends BaseRESTfulController {
         com.steerinfo.dil.wsdl.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);
+//        //测试服务器
 //        DeleteServiceInfo service = new DeleteServiceInfo("user", "dgjt@kingdee", "eas", "A004", "L2", 1);
 //        DeleteWSFaceFacadeSrvProxyServiceLocator locator = new DeleteWSFaceFacadeSrvProxyServiceLocator();
-        // 测试服务器
 //        service.setServername("172.16.62.243" , "8888");
-
-        WSContext wsContext = LoginUtil.doEASLogin(service);
+//        WSContext wsContext = LoginTestUtil.doEASLogin(service);
         String sessionId = wsContext.getSessionId();
         String output = null;
         Map<String , Object> resultMap = new HashMap<>();

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.mapper;
 
-
+import com.steerinfo.dil.model.AmsSaleOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.math.BigDecimal;
@@ -8,10 +9,10 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface OtherWarehouseMapper {
+public interface OtherWarehouseMapper extends IBaseMapper<AmsSaleOrder, BigDecimal> {
+
 
-    // 查询车辆信息
     Map<String, Object> getMapMessage(BigDecimal orderId);
-    // 查询车辆所运物资信息
+
     List<Map<String, Object>> getListMessage(BigDecimal orderId);
-}
+}

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

@@ -75,9 +75,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 收款客户
         String customer = (String) head.get("customer");
         for (Map<String, Object> entry : entries) {
+            // 物流销售订单分录主键
             BigDecimal stEntryId = (BigDecimal) entry.get("stEntryId");
+            // 是否磅重（0：磅重，1：理重）
             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");

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

@@ -259,7 +259,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             }else{
                 map.put("segmentSqe", map.get("grossSegmentSqe")); //毛重路段顺序
             }
-            if(orderType == 1){
+            if(orderType == 1 || orderType == 4){
                 //如果是钢材订单，获取下一个还没计量的实绩 将毛重数据作为下一个计量实绩的皮重
                 //并且是第二次传入重量才执行
                 List<Map<String, Object>> steelMapList = tmstruckWeightResultMapper.getNoNetWeightResultId(DataChange.dataToBigDecimal(map.get("resultTotalId")));

src/main/resources/application-dev.yml

@@ -3,6 +3,7 @@ spring:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
     password: root123
     username: dagang
+
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-join-api

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

@@ -4,8 +4,11 @@
 
 
     <select id="getListMessage" parameterType="DECIMAL" resultType="java.util.Map" >
-        SELECT OO.ORDER_NUMBER AS ""
+        SELECT OO.ORDER_NUMBER AS "receivingCode",
+               ASOM.TRUCK_REMARK AS "remark"
         FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
         LEFT JOIN AMS_SALE_ORDER ASO
@@ -18,12 +21,12 @@
         ON ASM.MATERIAL_ID = RM.MATERIAL_ID
         LEFT JOIN RMS_CAPACITY RC
         ON RC.CAPACITY_ID = OO.CAPACITY_ID
-
+        WHERE OO.ORDER_ID = #{orderId}
     </select>
 
     <select id="getMapMessage" parameterType="DECIMAL" resultType="java.util.Map" >
-        SELECT OO.ORDER_NUMBER AS "",
-               RC.CAPACITY_NUMBER AS ""
+        SELECT OO.ORDER_NUMBER AS "bb",
+               RC.CAPACITY_NUMBER AS "cc"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
                            ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -33,6 +36,6 @@
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
                  LEFT JOIN RMS_CONSIGNEE RCO
                            ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
-
+        WHERE OO.ORDER_ID = #{orderId}
     </select>
 </mapper>