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

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

@@ -147,6 +147,9 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         String orderNumber = (String) map.get("orderNumber");
         //通过订单号查询订单类型 及总实绩Id
         Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+        if(mesMap==null){
+            return -5;
+        }
         //卸货时查询是否含有净重
         BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);

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

@@ -2409,12 +2409,14 @@
                            r_carrier.carrier_id "carrierId",
                            r_carrier.carrier_name "carrierName",
                            oo.ORDER_ID "orderId",
+                           r_cap.CAPACITY_TEL "capacityTel",
                            NVL( r_carrier.carrier_id, 0 ) "carrierIds",
                            NVL( r_cap.capacity_id, 0 ) "capacityIds",
                             RDOINDEP.ORG_NAME "transInDep",
                            RDOOUTDEP.ORG_NAME "transOutDep",
                            RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse",
                            oo.ORDER_NUMBER  "orderNumber",
+                           oo.ORDER_STATUS "orderStatus",
                            TWR.RESULT_NET_WEIGHT    "netWeight"
                        FROM
                            AMS_SALE_ORDER ASO
@@ -2440,6 +2442,7 @@
                        WHERE
                            ASO.SALE_TYPE = 4
                          AND ASO.DELETED = 0
+                         AND rc.CONSIGNEE_COMPANY_NAME IS NOT NULL
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
         </if>
@@ -2460,6 +2463,7 @@
             and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
         </if>
         ORDER BY
+        ASO.SALE_ORDER_ID DESC,
         oo.ORDER_ID DESC)
     </select>
     <select id="getSteelReportDetailsBySmId" resultType="java.util.Map" parameterType="java.math.BigDecimal">