Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

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

@@ -221,7 +221,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     @ApiOperation(value="查询所有装车实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(91)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(206)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })

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

@@ -1,10 +1,8 @@
 package com.steerinfo.dil.controller;
-
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
-
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;

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

@@ -53,8 +53,6 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //内转物流汽车装货展示
     List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
 
-
-
     //通过实绩id渲染数据
     List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
 
@@ -66,4 +64,7 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //通过用户id查找用户姓名
     String selectPersonNameByPersonnelId(Integer personnelId);
+
+    //通过物资id查找物资类型
+    Integer selectMaterialTypeByMaterialId(Integer materialId);
 }

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

@@ -57,11 +57,11 @@ public interface ITmstruckLoadResultService{
     //内转物流汽车装货展示
     List<Map<String,Object>> selectLoadResultForConverted(Map<String,Object> map);
 
-
-
     //通过实绩id渲染数据
     List<Map<String,Object>> selectLoadResultByResultId(Integer resultId);
 
     //内转物流火车装车新增装车实绩
     int addLoadResultForConverted(Map<String,Object> map);
+    //销售物流新增装车实绩
+    int addLoadResultForSale(Map<String,Object> map);
 }

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

@@ -45,12 +45,11 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
-    
+
     @Autowired
     private WMSFeign wmsFeign;
 
 
-
     /**
      * 新增装车实绩
      * 运输订单号 或 运输订单Id
@@ -58,6 +57,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * 装车日期
      * 备注
      * 计量吨位
+     *
      * @param map
      * @return
      */
@@ -88,13 +88,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
         //新增港存库出库实绩 并修改实时库存
         BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
-        if(portId != null){
+        if (portId != null) {
             BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-            if(batchId != null){
+            if (batchId != null) {
                 Map<String, Object> hashMap = new HashMap<>();
                 hashMap.put("batchId", batchId);
                 hashMap.put("portId", portId);
-                hashMap.put("resultTonnage",resultMeasuredTonnage);
+                hashMap.put("resultTonnage", resultMeasuredTonnage);
                 hashMap.put("isClean", resultIsclear);
                 wmshBoundFeign.addResult(hashMap);
             }
@@ -103,12 +103,21 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
     /**
-     * 添加CG装货实绩
+
+     * 添加装货实绩
+     *
      * @param map
      * @return
      */
+    public int addLoadResult(Map<String, Object> map) {
+        return 0;
+    }
+
+        /**
+         *
+         */
     @Transactional
-    public int addCGLoadResult(Map<String, Object> map){
+    public int addCGLoadResult(Map<String,Object> map){
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
         Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
         // 新增装车实绩
@@ -149,10 +158,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
 
-
-
     /**
      * 遗留问题  （销售装车）
+     *
      * @param map
      * @return
      */
@@ -233,9 +241,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
         return 6;
     }
-    
+    /**
+     * 新增销售装车
+     */
+
     /**
      * 修改装车作业
+     *
      * @param tmstruckLoadResult
      * @return
      */
@@ -246,6 +258,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 通过ID查询装车实绩
+     *
      * @param resultId
      * @return
      */
@@ -256,6 +269,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 逻辑删除装车实绩 状态 1
+     *
      * @param resultId
      * @return
      */
@@ -269,6 +283,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 修改装车作业点 多个装车点随机分配给多个装车实绩
+     *
      * @param mapList
      * @return
      */
@@ -290,6 +305,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 查询销售合同装车实绩
+     *
      * @param map
      * @return
      */
@@ -304,7 +320,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * @param map {orderId 运输订单Id}
      * @return
      */
-    public int addSaleLoadResult(Map<String, Object> map){
+    public int addSaleLoadResult(Map<String, Object> map) {
 //        String orderNumber = (String) map.get("orderNumber");
         List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
         int i = 0;
@@ -324,13 +340,14 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 查询所有装车实绩
+     *
      * @param map
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
         Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType){
+        switch (orderType) {
             case 1:
                 return tmstruckLoadResultMapper.getXSLoadResult(map);
             case 2:
@@ -367,53 +384,54 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     //内转物流，新增装车实绩
     @Override
     public int addLoadResultForconverted(Map<String, Object> map) {
-        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //设置主键id
         tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
         //获取开始时间
-        Date startTime =(Date) map.get("startTime");
+        Date startTime = (Date) map.get("startTime");
         //获取运输订单号
-        String OrderNumber=map.get("OrderNumber").toString();
-        Map<String,Object> Map=new HashMap<>();
-        Map.put("OrderNumber",OrderNumber);
+        String OrderNumber = map.get("OrderNumber").toString();
+        Map<String, Object> Map = new HashMap<>();
+        Map.put("OrderNumber", OrderNumber);
         //通过运输订单号查找物资id
-        List<Map<String, Object>> materialIdList=tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(Map);
+        List<Map<String, Object>> materialIdList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(Map);
         //设置物资id
-        for (int i=0;i<materialIdList.size();i++){
-            Map<String,Object> map1 = materialIdList.get(i);
-            Integer materialId =(Integer) map1.get("materialId");
+        for (int i = 0; i < materialIdList.size(); i++) {
+            Map<String, Object> map1 = materialIdList.get(i);
+            Integer materialId = (Integer) map1.get("materialId");
             tmstruckLoadResult.setMaterialId(new BigDecimal(materialId));
         }
         //绑定总实绩id
-        Map<String,Object> map2=tmstruckReturnResultMapper.getResultTotalIdByOrderNumber(OrderNumber);
-        BigDecimal  reultTotalId=(BigDecimal)map2.get("resultTotalId");
+        Map<String, Object> map2 = tmstruckReturnResultMapper.getResultTotalIdByOrderNumber(OrderNumber);
+        BigDecimal reultTotalId = (BigDecimal) map2.get("resultTotalId");
         //设置总实绩id
         tmstruckLoadResult.setResultTotalId(reultTotalId);
         tmstruckLoadResult.setResultLoadStartTime(startTime);
         //获取用户id
-        Integer personnelId=(Integer)map.get("personnelId");
-        String personnelName= tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        Integer personnelId = (Integer) map.get("personnelId");
+        String personnelName = tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
         tmstruckLoadResult.setInsertTime(new Date());
         tmstruckLoadResult.setInsertUsername(personnelName);
-        int i=tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
         return i;
     }
+
     //内转物流,修改装车实绩
     @Override
     public int updateLoadResultForconverted(Map<String, Object> map) {
         //获取装车实绩id
         //通过运输订单号查找装车实绩
-        String orderNumber =(String) map.get("orderNumber");
-        Map<String,Object> map1 = tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
+        String orderNumber = (String) map.get("orderNumber");
+        Map<String, Object> map1 = tmstruckLoadResultMapper.selectLoadResultIdByOrderNumber(orderNumber);
         //获取结束时间
-        Integer LoadResultId=(Integer)map1.get("loadResultId");
-        Date endTime=(Date)map.get("endTime");
-        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        Integer LoadResultId = (Integer) map1.get("loadResultId");
+        Date endTime = (Date) map.get("endTime");
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         //根据主键id设置装车结束时间
         tmstruckLoadResult.setResultId(new BigDecimal(LoadResultId));
         tmstruckLoadResult.setResultLoadEndTime(endTime);
         //获取装车开始时间
-        Date startTime = (Date)map1.get("startTime");
+        Date startTime = (Date) map1.get("startTime");
         //开始时间
         long LoadstartTime = startTime.getTime();
         long LoadendTime = endTime.getTime();
@@ -421,7 +439,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         long l = time / 1000;
         //设置标准时长
         tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
-        int i=tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
+        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         return i;
     }
 
@@ -432,6 +450,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 内转物流汽车装货实绩展示
+     *
      * @param map
      * @return
      */
@@ -443,6 +462,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 根据实绩id渲染数据
+     *
      * @param resultId
      * @return
      */
@@ -453,32 +473,94 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 内转物流新增装车实绩(火车卸货后装车，装车点固定为达州站）
+     *
      * @param map
      * @return
      */
     @Override
     public int addLoadResultForConverted(Map<String, Object> map) {
-        Integer personnelId =(Integer) map.get("personnelId");
-        String personnelName= tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
-        TmstruckLoadResult tmstruckLoadResult=new TmstruckLoadResult();
+        Integer personnelId = (Integer) map.get("personnelId");
+        String personnelName = tmstruckLoadResultMapper.selectPersonNameByPersonnelId(personnelId);
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
         tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-        //获取车牌号
-        String capacityNumber = (String)map.get("capacityNumber");
-        Map<String,Object> map1 = tmstruckLoadResultMapper.selectMaterialIdAndCapacityId(capacityNumber);
-        BigDecimal materialId =(BigDecimal) map1.get("materialId");
-        BigDecimal resultTotalId = (BigDecimal)map1.get("resultTotalId");
+        //获取车牌号，物资id以及总实绩id
+        String capacityNumber = (String) map.get("capacityNumber");
+        Map<String, Object> map1 = tmstruckLoadResultMapper.selectMaterialIdAndCapacityId(capacityNumber);
+        BigDecimal materialId = (BigDecimal) map1.get("materialId");
+        BigDecimal resultTotalId = (BigDecimal) map1.get("resultTotalId");
         tmstruckLoadResult.setMaterialId(materialId);
         tmstruckLoadResult.setResultTotalId(resultTotalId);
         tmstruckLoadResult.setInsertTime(new Date());
         //获取装货点
-        Integer arrivalId =(Integer) map.get("arrivalId");
+        Integer arrivalId = (Integer) map.get("arrivalId");
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(arrivalId));
-        Date insertTime =(Date)map.get("insertTime");
+        Date insertTime = (Date) map.get("insertTime");
         tmstruckLoadResult.setInsertTime(insertTime);
-        Integer tonnage =(Integer) map.get("tonnage");
+        Integer tonnage = (Integer) map.get("tonnage");
         tmstruckLoadResult.setResultMeasuredTonnage(DataChange.dataToBigDecimal(tonnage));
         tmstruckLoadResult.setInsertUsername(personnelName);
         return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
     }
 
+    @Override
+    public int addLoadResultForSale(Map<String, Object> map) {
+        //新增装车实绩
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //新增id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //通过运输订单号查找物资
+        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
+        for (int i = 0; i < materialList.size(); i++) {
+            Map<String, Object> map3 = materialList.get(i);
+            BigDecimal materialId = (BigDecimal) map3.get("materialId");
+            tmstruckLoadResult.setMaterialId(materialId);
+            if (tmstruckLoadResultMapper.selectMaterialTypeByMaterialId(materialId.intValue())==2) {
+                List list = tmstruckLoadResultMapper.selectResultIdByOrderNumber((String) map.get("orderNumber"));
+                //查询最大id和最小id
+                Integer maxResultId = (Integer) Collections.max(list);
+                Integer minResultId = (Integer) Collections.min(list);
+                //根据最大id查找扫描时间
+                Map map1 = tmstruckLoadResultMapper.selectLoadTimeByResultId(minResultId);
+                Date startdate = (Date) map1.get("loadTime");
+                Integer loaderId = tmstruckLoadResultMapper.selecLoadIdByresultId(minResultId);
+                //根据最小id查找扫描时间
+                Map map2 = tmstruckLoadResultMapper.selectLoadTimeByResultId(maxResultId);
+                Date endDate = (Date) map2.get("loadTime");
+                tmstruckLoadResult.setResultLoadStartTime(startdate);
+                tmstruckLoadResult.setResultLoadEndTime(endDate);
+                //开始时间
+                long startTime = startdate.getTime();
+                long endTime = endDate.getTime();
+                long time = endTime - startTime;
+                long l = time / 1000;
+                tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
+                tmstruckLoadResult.setLoaderId(new BigDecimal(loaderId));
+                //新增出库实绩
+                wmsFeign.insertOutBoundResult(map);
+                //水渣，焦炭装车
+            }else if (tmstruckLoadResultMapper.selectMaterialTypeByMaterialId(materialId.intValue())==7
+                    &&tmstruckLoadResultMapper.selectMaterialTypeByMaterialId(materialId.intValue())==8){
+                //新增水渣，焦炭装车实绩
+                //获取结束时间
+                Integer LoadResultId = (Integer) map.get("loadResultId");
+                Date endTime = (Date) map.get("endTime");
+                //根据主键id设置装车结束时间
+                tmstruckLoadResult.setResultId(new BigDecimal(LoadResultId));
+                tmstruckLoadResult.setResultLoadEndTime(endTime);
+                //获取装车开始时间
+                Date startTime = (Date) map.get("startTime");
+                //开始时间
+                long LoadstartTime = startTime.getTime();
+                long LoadendTime = endTime.getTime();
+                long time = LoadendTime - LoadstartTime;
+                long l = time / 1000;
+                //设置标准时长
+                tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
+            }
+
+        }
+        int i=tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        return i;
+}
+
 }

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

@@ -10,7 +10,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.security.provider.MD5;
+
 
 import java.math.BigDecimal;
 import java.util.Date;

src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ openfeign:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:dev-discovery.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:paas-discovery-test.steerinfo.com}:${EUREKA_PORT:80}/eureka/
     registerWithEureka:
       false
     fetchRegistry:

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

@@ -809,22 +809,22 @@
            RM.MATERIAL_NAME "materialName"
 
     from TMSTRUCK_LOAD_RESULT TLR
-           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                     ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
-           LEFT JOIN OMSTRUCK_ORDER OO
-                     ON OO.ORDER_ID=TTR.ORDER_ID
-           left join AMS_PURCHASE_ORDER APO
-                     ON oo.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
-           LEFT JOIN DIL_BATCH DB
-                     ON DB.BATCH_ID=APO.BATCH_ID
-           LEFT JOIN RMS_MATERIAL RM
-                     ON RM.MATERIAL_ID=TLR.MATERIAL_ID
-           LEFT JOIN RMS_CAPACITY RC
-                     ON OO.CAPACITY_ID = RC.CAPACITY_ID
-           LEFT JOIN  TMSTRAIN_LOADING_RESULT TLR2
-                      ON TLR2.PURCHASE_ORDER_RAIL_PLAN_ID=OO.ORDER_PLAN_ID
-           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
-                     ON  RAS.ARRIVAL_ID=TLR.LOADING_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+    LEFT JOIN OMSTRUCK_ORDER OO
+    ON OO.ORDER_ID=TTR.ORDER_ID
+    left join AMS_PURCHASE_ORDER APO
+    ON oo.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+    LEFT JOIN DIL_BATCH DB
+    ON DB.BATCH_ID=APO.BATCH_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID=TLR.MATERIAL_ID
+    LEFT JOIN RMS_CAPACITY RC
+    ON OO.CAPACITY_ID = RC.CAPACITY_ID
+    LEFT JOIN  TMSTRAIN_LOADING_RESULT TLR2
+    ON TLR2.PURCHASE_ORDER_RAIL_PLAN_ID=OO.ORDER_PLAN_ID
+    LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
+    ON  RAS.ARRIVAL_ID=TLR.LOADING_ID
 
   </select>
 
@@ -857,6 +857,13 @@
     from  RMS_PERSONNEL RP
     where RP.PERSONNEL_ID=#{personnelId}
   </select>
+<select id="selectMaterialTypeByMaterialId" parameterType="java.lang.Integer" resultType="java.lang.Integer">
+  select RMT.MATERIAL_TYPE_ID "materialTypeId"
+  FROM  RMS_MATERIAL RM
+  LEFT JOIN RMS_MATERIAL_TYPE RMT
+  ON RMT.MATERIAL_TYPE_ID=RM.MATERIAL_TYPE_ID
+  where RM.MATERIAL_ID=#{materialId}
+</select>
 
 <!--  查询销售装车实绩  -->
     <select id="getXSLoadResult" parameterType="java.util.Map" resultType="java.util.Map">

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

@@ -799,6 +799,170 @@
       on RTC.TRUCK_CALCULATE_ID = RTCM.TRUCK_CALCULATE_ID and RTC.TRUCK_CALCULATE_STATUS = 0
       where RM.MATERIAL_ID = #{materialId}
     </select>
+
+
+<!--计量委托查询所需数据-->
+<!--销售查询计毛 -->
+  <select id="selectMakesureGrossForSaleByOrderNumber" parameterType="java.lang.String" resultType="java.util.Map">
+    SELECT
+      OO.ORDER_NUMBER "orderNumber",
+      RC.CAPACITY_NUMBER "capacityNumber",
+      ASO.SALE_NUMBER "saleNumber",
+      RTC.TRUCK_CALCULATE_NUMBER "calcuateNumber",
+      RM.MATERIAL_NAME "materialName",
+      RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoretialWeight",
+      RS.SHIPPER_NAME "shipperName",
+      RRA.ADDRESS_DELIVERY_ADDRESS "addressDelivery"
+    FROM
+      OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_GROSS_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = ASO.RECEIVE_ID
+    WHERE
+      OO.ORDER_NUMBER = #{orderNumber} and  OO.ORDER_TYPE=1
+  </select>
+<!--销售物流查询计皮作业  -->
+  <select id="selectMakesureTareForSaleByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+    SELECT
+      OO.ORDER_NUMBER "orderNumber",
+      RC.CAPACITY_NUMBER "capacityNumber",
+      ASO.SALE_NUMBER "saleNumber",
+      RTC.TRUCK_CALCULATE_NUMBER "calcuateNumber",
+      RM.MATERIAL_NAME "materialName",
+      RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoretialWeight",
+      RS.SHIPPER_NAME "shipperName",
+      RRA.ADDRESS_DELIVERY_ADDRESS "addressDelivery"
+    FROM
+      OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_TARE_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = ASO.RECEIVE_ID
+    WHERE
+      OO.ORDER_NUMBER = #{orderNumber} and OO.ORDER_TYPE=1
+  </select>
+<!--内转物流查询计皮作业 -->
+  <select id="selectMakesureTareForConvertedByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+      SELECT OO.ORDER_NUMBER "orderNumber",
+             ARP.REQUIREMENT_NUMBER "requirementNumber",
+             OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+             OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+             RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+             RL.LINE_START_NODE_DESC "startNode",
+             RL.LINE_END_NODE_DESC "endNode",
+             RC.CAPACITY_NUMBER "capacityNumber",
+             RTC.TRUCK_CALCULATE_NUMBER "calculateNumber"
+      FROM  OMSTRUCK_ORDER OO
+      LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+      LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
+      LEFT JOIN  RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+      LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+      LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_ID
+      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
+      LEFT JOIN RMS_TRUCK_CALCULATE  RTC
+      ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_TARE_PLACE_ID
+    WHERE OO.ORDER_NUMBER=#{orderNumber} and OO.ORDER_TYPE=11
+  </select>
+<!-- 内转物流查询计毛作业 -->
+  <select id="selectMakesureGrossForConvertedByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+    SELECT OO.ORDER_NUMBER "orderNumber",
+           ARP.REQUIREMENT_NUMBER "requirementNumber",
+           OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+           OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+           RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+           RL.LINE_START_NODE_DESC "startNode",
+           RL.LINE_END_NODE_DESC "endNode",
+           RC.CAPACITY_NUMBER "capacityNumber",
+           RTC.TRUCK_CALCULATE_NUMBER "calculateNumber"
+    FROM  OMSTRUCK_ORDER OO
+            LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+            LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
+            LEFT JOIN  RMS_CAPACITY RC ON OO.CAPACITY_ID = RC.CAPACITY_ID
+            LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+            LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_ID
+            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
+            LEFT JOIN RMS_TRUCK_CALCULATE  RTC   ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_GROSS_PLACE_ID
+    WHERE OO.ORDER_NUMBER=#{orderNumber} and OO.ORDER_TYPE=11
+  </select>
+<!-- 采购查询计皮 -->
+  <select id="selectMakesureGrossForPurchase" parameterType="java.lang.String" resultType="java.util.Map">
+    SELECT OO.ORDER_NUMBER "orderNumber",
+           APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+           OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+           OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+           RTC.TRUCK_CALCULATE_NUMBER "calculateNumber",
+           RS.SHIPPER_NAME "shipperName",
+           RRA.ADDRESS_DELIVERY_ADDRESS "deliveryAdress",
+           RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+           RC.CAPACITY_NUMBER "capacityNumber"
+    FROM OMSTRUCK_ORDER OO
+    LEFT JOIN AMS_PURCHASE_ORDER APO
+    ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+    LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+    ON OO.ORDER_ID=OOM.ORDER_ID
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON OO.ORDER_ID = TTR.ORDER_ID
+    LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+    ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+    LEFT JOIN RMS_TRUCK_CALCULATE RTC
+    ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_GROSS_PLACE_ID
+    LEFT JOIN RMS_SHIPPER RS
+    ON RS.SHIPPER_ID=APO.SUPPLIER_UNIT_ID
+    LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+    ON RRA.ADDRESS_ID=APO.RECEIVE_UNIT_ID
+    LEFT JOIN RMS_MATERIAL_STEEL RMS
+    ON  RMS.MATERIAL_ID=OOM.MATERIAL_ID
+    LEFT JOIN RMS_CAPACITY RC
+    ON  RC.CAPACITY_ID=OO.CAPACITY_ID
+    WHERE OO.ORDER_NUMBER=#{orderNumber}
+  </select>
+  <!-- 采购查询计皮 -->
+  <select id="selectMakesureTareForPurchase" parameterType="java.lang.String" resultType="java.util.Map">
+    SELECT OO.ORDER_NUMBER "orderNumber",
+           APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+           OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+           OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+           RTC.TRUCK_CALCULATE_NUMBER "calculateNumber",
+           RS.SHIPPER_NAME "shipperName",
+           RRA.ADDRESS_DELIVERY_ADDRESS "deliveryAdress",
+           RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+           RC.CAPACITY_NUMBER "capacityNumber"
+    FROM   OMSTRUCK_ORDER OO
+           LEFT JOIN AMS_PURCHASE_ORDER APO
+           ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+           LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+           ON OO.ORDER_ID=OOM.ORDER_ID
+           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+           ON OO.ORDER_ID = TTR.ORDER_ID
+           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+           ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+           LEFT JOIN RMS_TRUCK_CALCULATE RTC
+           ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_TARE_PLACE_ID
+           LEFT JOIN RMS_SHIPPER RS
+           ON RS.SHIPPER_ID=APO.SUPPLIER_UNIT_ID
+           LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+           ON RRA.ADDRESS_ID=APO.RECEIVE_UNIT_ID
+           LEFT JOIN RMS_MATERIAL_STEEL RMS
+           ON  RMS.MATERIAL_ID=OOM.MATERIAL_ID
+           LEFT JOIN RMS_CAPACITY RC
+           ON  RC.CAPACITY_ID=OO.CAPACITY_ID
+    WHERE OO.ORDER_NUMBER=#{orderNumber}
+  </select>
 <!--  //通过运输订单id获取路段顺序号、物资类型、计量实绩主键、line_id
     Map<BigDecimal, String> selectByOrderId(BigDecimal orderId);-->
     <select id="selectByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
@@ -838,6 +1002,7 @@
     from rms_line_segemnt rls
     where rls.line_id = 1
       and rls.segment_sqe = #{orderLineSequence}+2
+
   </select>
 
 <!-- 查询销售所有计皮实绩 -->