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

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

@@ -827,7 +827,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                             String saler,
                                             String easPrimaryId
     ){
-        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根时间段查询数据
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId) && carrierSsoId != null){
                 map.put("carrierSsoId", carrierSsoId);

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

@@ -2204,7 +2204,12 @@
         ASO.SALE_NUMBER "saleOrderNo",
         ASO.SALE_ORDER_STATUS "saleOrderStatus",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
-        ASM.MATERIAL_NUMBER "materialNum",
+        CASE
+            WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
+            then null
+            when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
+            then ASM.MATERIAL_NUMBER
+            end "materialNum",
         ASM.EAS_PRIMARY_ID "closeEntryId",
         ASM.DELETED "deletedStatus",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",
@@ -2475,7 +2480,12 @@
         to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd') "orderTime",
         ASO.SALE_NUMBER "saleOrderNo",
         ASM.SALE_MATERIAL_ID "saleMaterialId",
-        ASM.MATERIAL_NUMBER "materialNum",
+        CASE
+        WHEN nvl(TWR.RESULT_GROSS_WEIGHT,0) =0
+        then null
+        when nvl(TWR.RESULT_GROSS_WEIGHT,0) !=0
+        then ASM.MATERIAL_NUMBER
+        end "materialNum",
         ASM.EAS_PRIMARY_ID "closeEntryId",
         ASM.DELETED "deletedStatus",
         RC.CONSIGNEE_COMPANY_NAME "consigneeName",