Merge remote-tracking branch 'origin/master'

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

@@ -199,7 +199,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         if(orderType == 2){
             Map<String,Object> loadResultMap = tmstruckLoadResultMapper.getLoadResultMap(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
             //根据总实绩ID查询该车有没有装货
-            if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
+            if(loadResultMap != null && loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
             }
             // 查询运单所属的销售订单id

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

@@ -1921,6 +1921,8 @@
                         END)
                      "carrierName",
                     OO.ORDER_NUMBER "orderNo",
+                    ACTP.PRICE_VALUE AS "priceValue",
+                    BDO.DETAILS_AMOUNT AS "detailsAmount",
                     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
                     RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
                     RRP.PLACE_ID "placeId",
@@ -1998,6 +2000,10 @@
                     LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
                               ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                   AND TLR.MATERIAL_ID = RM.MATERIAL_ID
+                    LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+                              ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
+                    LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp
+                              ON actp.PRICE_ID = bdo.PRICE_ID
                     LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                               ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                     LEFT JOIN TMSTRUCK_ARRIVAL_RESULT TAR
@@ -2392,6 +2398,7 @@
         R_CARRIER.CARRIER_ID        "carrierId",
         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
         OO.ORDER_STATUS              "carStatus",
+        ACTP.PRICE_VALUE            "priceValue",
         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
         2,'销售已提交',
         4,'财务已审批',
@@ -2433,6 +2440,9 @@
         ON TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN TMStRUCK_RECEIPT_RESULT TRR
         ON TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+        ON BDO.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE actp ON actp.PRICE_ID = bdo.PRICE_ID
         WHERE ASO.SALE_TYPE = 1
         AND ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
     </select>
@@ -2450,7 +2460,8 @@
         TWR.RESULT_TARE_WEIGHT       "tareWeight",
         TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
         TWR.RESULT_NET_WEIGHT        "netWeight",
-        TLR.RESULT_LOAD_END_TIME     "loadTime"
+        TLR.RESULT_LOAD_END_TIME     "loadTime",
+        BDO.DETAILS_AMOUNT           "detailsAmount"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
@@ -2468,6 +2479,8 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+        LEFT JOIN BMSTRUCK_DETAILS_ORDER BDO
+        ON BDO.WEIGHT_TASK_RESULT_ID = TWR.WEIGHT_TASK_RESULT_ID
         LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
         ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         AND TLR.MATERIAL_ID = RM.MATERIAL_ID