Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java
#	src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

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

@@ -155,7 +155,8 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
                                                      String capacityNo,
                                                      String shipperNames,
                                                      String transRangeValues,
-                                                     String materialTypeNames){
+                                                     String materialTypeNames,
+                                                     String isPage){
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }
@@ -180,6 +181,9 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         mapValue.put("detailStatus",detailStatus);
+        if("yes".equals(isPage)){
+            return success(bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getInwardWeightDetailsOrder(mapValue,orderType);
@@ -195,7 +199,13 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
                                             String carrierSsoId,
                                             String userId,
                                             String startTime,
-                                            String endTime){
+                                            String endTime,
+                                            String orgCode,
+                                            String capacityNo,
+                                            String transRangeValues,
+                                            String materialTypeNames,
+                                            String shipperNames,
+                                            String isPage){
         if (carrierSsoId != null && carrierSsoId.equals("undefined")) {
             carrierSsoId = null;
         }
@@ -206,7 +216,22 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         if(userId != null){
             mapValue.put("userId","%"+ userId +"%");
         }
+        if(capacityNo != null && !"null".equals(capacityNo)){
+            mapValue.put("capacityNo","%"+ capacityNo +"%");
+        }
+        if(shipperNames != null && !"null".equals(shipperNames)){
+            mapValue.put("shipperNames","%"+ shipperNames +"%");
+        }
+        if(transRangeValues != null && !"null".equals(transRangeValues)){
+            mapValue.put("transRangeValues","%"+ transRangeValues +"%");
+        }
+        if(materialTypeNames != null && !"null".equals(materialTypeNames)){
+            mapValue.put("materialTypeNames","%"+ materialTypeNames +"%");
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if("yes".equals(isPage)){
+            return success(bmstruckDetailsOrderService.getNoInwardDetails(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getNoInwardDetails(mapValue);
@@ -269,7 +294,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "orderId", value = "汽运计量实绩id", required = false, dataType = "BigDecimal"),
     })
     @PostMapping("/addInwardDetailsOrder")
-    public RESTfulResult addInwardDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
+    public synchronized RESTfulResult  addInwardDetailsOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         int code = bmstruckDetailsOrderService.inserInwardOrder(mapVal);
         return success(code);
     }
@@ -408,6 +433,17 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation("根据运输订单ID查询计重结算需要的信息")
+    @PostMapping("newInwardSettle")
+    public RESTfulResult newInwardSettle(@RequestBody Map<String,Object> map){
+        //接收到运输订单号数组
+        List<Map<String,Object>> orderIds = (List<Map<String,Object>>)map.get("orderIds");
+        int i = bmstruckDetailsOrderService.newInwardSettle(orderIds);
+        return success(i);
+
+    }
+
+
 
     private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
         Set<Map<String, Object>> setString = new HashSet<>();

src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -0,0 +1,24 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 18:05
+ */
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.OmsFeign.url}")
+public interface OmsFeign {
+
+    @PostMapping("api/v1/oms/omstruckorderseparates/closeInwardOrder")
+    Map<String,Object> closeInwardOrder(@RequestParam("orderId") Integer orderId,
+                                        @RequestParam(value = "status") Integer status);
+
+}

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

@@ -168,4 +168,10 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
      * @Description:查询出收货地址
     */
     String queryaddress1(BigDecimal priceid);
+    Integer selectDetailsByOrder(BigDecimal orderId);
+
+    List<BigDecimal> getDetailsIdByOrderId(Integer orderId);
+
+    BigDecimal selectNetWeight(BigDecimal orderId);
+
 }

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

@@ -112,4 +112,6 @@ public interface IBmstruckDetailsOrderService {
     List<Map<String, Object>> getNoInwardDetails(Map<String, Object> mapValue);
 
     List<Map<String, Object>> getSteelTruckDetailsOrder(Map<String, Object> mapValue);
+
+    int newInwardSettle(List<Map<String,Object>> orderIds);
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.JoinApiFeign;
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.BmstruckDetailsOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.model.BmstruckDetailsOrder;
@@ -10,6 +11,7 @@ import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.EASUtil;
 import com.steerinfo.dil.util.NoUtil;
 import io.swagger.models.auth.In;
+import org.apache.shiro.crypto.hash.Hash;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,13 +46,17 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
     @Autowired
     OmstruckOrderMapper omstruckOrderMapper;
 
+    @Autowired
+    OmsFeign omsFeign;
 
     //以下订单类型是需要算计量实绩的
-    final private List<Integer>  inwardTypeList = Arrays.asList(10,11,15,16,23,24,20);
+    final private List<Integer>  inwardTypeList = Arrays.asList(10,11,15,16,23,24,20,25);
     //以下订单类型是需要根据线路去匹配承运起止范围以及物资
     final private List<Integer>  toLineAndMaterial = Arrays.asList(10,20,23,24);
     //以下订单类型是需要去根据固定承运起止范围以及物资
     final private List<Integer>  fixLineList = Arrays.asList(15,16);
+    //以下订单类型是钢材
+    final private List<Integer> steelTypeList = Arrays.asList(25);
 
     /**
      * 展示汽运详单列表
@@ -564,6 +570,10 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         BigDecimal orderId= DataChange.dataToBigDecimal(mapVal.get("orderId"));
         //根据运输订单去查找订单类型
         BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(orderId);
+        //根据运输订单id去查询计费详单id
+        if(bmstruckDetailsOrderMapper.selectDetailsByOrder(orderId) > 0){
+            return -1;
+        }
         List<Map<String,Object>> priceAmountList = new ArrayList<>();
         if(inwardTypeList.contains(orderType.intValue())){
             //获取该订单的计量实绩ID以及净重,只会返回一条数据
@@ -576,18 +586,36 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             Map<String,Object> map = bmstruckDetailsOrderMapper.getPurInwardPrice(priceInfoPur);
             if(map != null){
                 mapVal.putAll(map);
+            }else{
+                return -1;
             }
         }
         if(fixLineList.contains(orderType.intValue())){
             //拼装车皮进厂以及一焦化采购焦炭进厂
             Map<String,Object> priceInfoPur = bmstruckDetailsOrderMapper.getPriceInfoPur(orderId);
-            if(priceInfoPur.get("transRangeId") == null && priceInfoPur.get("materialTypeId") != null){
-                priceInfoPur.put("transRangeId",1);
-            }
+            priceInfoPur.put("transRangeId",1);
             //根据物资品类ID和承运起止范围去匹配单价
             Map<String,Object> map = bmstruckDetailsOrderMapper.getPurInwardPrice(priceInfoPur);
             if(map != null){
                 mapVal.putAll(map);
+            }else{
+                return -1;
+            }
+        }
+        if(steelTypeList.contains(orderType.intValue())){
+            //钢材倒库
+            //首先获取净重
+            //BigDecimal netWeight = bmstruckDetailsOrderMapper.selectNetWeight(orderId);
+            //mapVal.put("netWeight",netWeight);
+            //获取单价
+            Map<String, Object> priceInfoPur = new HashMap<>();
+            priceInfoPur.put("transRangeId",1);
+            priceInfoPur.put("materialTypeId",5102);
+            Map<String,Object> map = bmstruckDetailsOrderMapper.getPurInwardPrice(priceInfoPur);
+            if(map != null){
+                mapVal.putAll(map);
+            }else{
+                return -1;
             }
         }
         if(orderType.intValue() == 21){
@@ -715,5 +743,60 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
         return bmstruckDetailsOrderMapper.getSteelTruckDetailsOrder(mapValue);
     }
 
+    @Override
+    public int newInwardSettle(List<Map<String,Object>> orderIds) {
+        int count = 0;
+        //遍历数组
+        for(Map<String,Object> orderIdMap:orderIds){
+            Integer orderId = DataChange.dataToBigDecimal(orderIdMap.get("orderId")).intValue();
+            //根据运输ID获取订单类型
+            BigDecimal orderType = bmstruckDetailsOrderMapper.getOrderType(new BigDecimal(orderId));
+            //根据订单类型调用不同的方法
+            //如果订单类型是11,
+            if(orderType.intValue() == 11){
+                List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
+                if(detailsIds.size() == 0){
+                    omsFeign.closeInwardOrder(orderId,1);
+                    count++;
+                }else{
+                    for(int i=0;i<detailsIds.size()-1;i++){
+                        bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsIds.get(i));
+                        count++;
+                    }
+                }
+            }
+            if(orderType.intValue() == 10 || orderType.intValue() == 20){
+                //根据运输订单ID找寻计费详单ID
+                List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
+                for(BigDecimal detailsId:detailsIds){
+                    //根据详单ID物理删除详单
+                    bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsId);
+                    count++;
+
+                }
+                inserInwardOrder(orderIdMap);
+            }
+            if(orderType.intValue() == 23){
+                List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
+                for(BigDecimal detailsId:detailsIds){
+                    //根据详单ID物理删除详单
+                    bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsId);
+                    count++;
+                }
+                inserInwardOrder(orderIdMap);
+            }
+            if(orderType.intValue() == 16 || orderType.intValue() == 15){
+                List<BigDecimal> detailsIds = bmstruckDetailsOrderMapper.getDetailsIdByOrderId(orderId);
+                for(BigDecimal detailsId:detailsIds){
+                    //根据详单ID物理删除详单
+                    bmstruckDetailsOrderMapper.deleteByPrimaryKey(detailsId);
+                    count++;
+                }
+                inserInwardOrder(orderIdMap);
+            }
+        }
+        return count;
+    }
+
 
 }

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ spring:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 server:
   port: 8076

src/main/resources/application-prod.yml

@@ -11,6 +11,8 @@ spring:
 openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:172.16.33.166:8095}
 
 server:
   port: 8076

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

@@ -1229,6 +1229,7 @@
                 ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
             WHERE OO.ORDER_ID = #{orderId}
             order by twr.GROSS_SEGMENT_SQE desc)
+            WHERE ROWNUM = 1
     </select>
           <select id="getInwardWeightDetailsOrder" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
@@ -1574,15 +1575,15 @@
         GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME) as "netTime",
         RMT.MATERIAL_TYPE_NAME as "materialTypeName",
         decode(RMT.MATERIAL_ISINWARD,1,'是','否')   as "materialIsWard",
-        RTR.TRANS_RANGE_VALUE as "rangeValue",
+        RTR.TRANS_RANGE_VALUE as "transRangeValue",
         decode(oo.ORDER_TYPE,11,'纯内转',15,'拼装车皮进厂',16,'一焦化采购进厂',10,'新区专线-新区',20,'新区专线-老区',23,'厂外内转-老区',24,'厂外内转-新区') as "orderType"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+        ON BDO.ORDER_ID = OO.ORDER_ID
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
-        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN RMS_MATERIAL RM
         ON RM.MATERIAL_ID = TWR.MATERIAL_ID
         LEFT JOIN RMS_MATERIAL_TYPE RMT
@@ -1611,7 +1612,7 @@
         ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
         WHERE
         BDO.DETAILS_ID IS NULL
-        AND OO.ORDER_TYPE in (11, 15, 16, 23, 24,10,20)
+        AND OO.ORDER_TYPE in (11, 15, 16, 23, 24,10,20,25)
         AND OO.ORDER_STATUS = 2
         <if test="userId != null">
         AND AIR.INSERT_USERNAME LIKE #{userId}
@@ -1625,6 +1626,25 @@
         </if>
         order by twr.result_tare_weight_time desc
         )
+        <where>
+            <if test="capacityNo!= null">
+                and
+                "capacityNumber" like #{capacityNo}
+            </if>
+            <if test="shipperNames!= null">
+                and
+                "shipperName" like #{shipperNames}
+            </if>
+            <if test="transRangeValues!= null">
+                and
+                "transRangeValue" like #{transRangeValues}
+            </if>
+            <if test="materialTypeNames!= null">
+                and
+                "materialTypeName" like #{materialTypeNames}
+            </if>
+        </where>
+
 
     </select>
     <select id="getPriceInfoPur" resultType="java.util.Map" parameterType="DECIMAL">
@@ -1691,7 +1711,8 @@
                                  bdo.DETAILS_NO AS "detailsNo",
                                  bdo.DETAILS_TIME AS "detailsTime",
                                  decode(OO.ORDER_TYPE, 11, '纯内转') "orderType",
-                                 bdo.INSERT_TIME    "insertTime"
+                                 bdo.INSERT_TIME    "insertTime",
+                                ORDER_LINE_SEQUENCE "orderLineSeq"
                           FROM BMSTRUCK_DETAILS_ORDER bdo
                                    LEFT JOIN TMSTRUCK_WEIGHT_RESULT twr
                                              ON twr.WEIGHT_TASK_RESULT_ID = bdo.WEIGHT_TASK_RESULT_ID
@@ -1728,16 +1749,16 @@
                                    LEFT JOIN DIL_BATCH DB
                                              ON DB.BATCH_ID = 0
                           WHERE bdo.WETHER_TO_STATEMENT = #{detailStatus}
-                            AND oo.ORDER_TYPE = 11
+                            AND oo.ORDER_TYPE in (11,25)
                             <if test="userId != null" >
                                 AND AIR.INSERT_USERNAME LIKE #{userId}
                             </if>
                             <if test="oneDate != null">
-                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
+                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
                             <if test="startDate != null">
-                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
-                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
+                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
+                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
                           UNION ALL
                           select rc.capacity_number "capacityNumber",
@@ -1768,7 +1789,8 @@
                                         '厂外-老区厂内',
                                         24,
                                         '厂外-新区厂内') "orderType",
-                                 bdo.INSERT_TIME    "insertTime"
+                                 bdo.INSERT_TIME    "insertTime",
+                                 ORDER_LINE_SEQUENCE "orderLineSeq"
                           FROM BMSTRUCK_DETAILS_ORDER BDO
                                    LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
                                              ON TWR.WEIGHT_TASK_RESULT_ID = BDO.WEIGHT_TASK_RESULT_ID
@@ -1814,11 +1836,11 @@
                                 AND AIR.INSERT_USERNAME LIKE #{userId}
                             </if>
                             <if test="oneDate != null">
-                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
+                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
                             <if test="startDate != null">
-                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
-                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
+                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
+                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
                           UNION ALL SELECT
                                         rc.capacity_number "capacityNumber",
@@ -1842,7 +1864,8 @@
                                         bdo.details_no "detailsNo",
                                         bdo.details_time "detailsTime",
                                         decode( OO.ORDER_TYPE, 15, '拼装车皮进厂', 16, '一焦化-厂内' ) "orderType",
-                                        bdo.INSERT_TIME    "insertTime"
+                                        bdo.INSERT_TIME    "insertTime",
+                                        ORDER_LINE_SEQUENCE "orderLineSeq"
                           FROM
                               BMSTRUCK_DETAILS_ORDER BDO
                                   LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.WEIGHT_TASK_RESULT_ID = BDO.WEIGHT_TASK_RESULT_ID
@@ -1873,11 +1896,11 @@
                                 AND AIR.INSERT_USERNAME LIKE #{userId}
                             </if>
                             <if test="oneDate != null">
-                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
+                                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
                             <if test="startDate != null">
-                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= bdo.INSERT_TIME
-                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= bdo.INSERT_TIME
+                                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
+                                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= GREATEST(TWR.RESULT_GROSS_WEIGHT_TIME, TWR.RESULT_TARE_WEIGHT_TIME)
                             </if>
         )
         <where>
@@ -1933,6 +1956,12 @@
                     "materialName" in #{item}
                 </foreach>
             </if>
+            <if test="materialTypeName!= null">
+                and
+                <foreach collection="materialTypeName" item="item" open="(" separator="," close=")">
+                    "materialTypeName" in #{item}
+                </foreach>
+            </if>
         </where>
         <include refid="orderBy"></include>
     </select>
@@ -2006,6 +2035,22 @@
                         order by oo.order_id desc
             )
     </select>
+    <select id="selectDetailsByOrder" resultType="java.lang.Integer" parameterType="decimal">
+        SELECT count(BDO.DETAILS_ID) FROM BMSTRUCK_DETAILS_ORDER BDO
+        WHERE BDO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getDetailsIdByOrderId" resultType="java.math.BigDecimal" parameterType="java.lang.Integer">
+        SELECT BDO.DETAILS_ID FROM BMSTRUCK_DETAILS_ORDER BDO
+        WHERE
+
+        BDO.ORDER_ID = #{orderId}
+    </select>
+    <select id="selectNetWeight" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT TLR.RESULT_MEASURED_TONNAGE FROM TMSTRUCK_TOTAL_RESULT TTR
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId}
+    </select>
 
     <select id="queryaddress" resultType="java.util.Map">
         select t.place_id "placeid"