dhaj

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

@@ -57,7 +57,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                String con
     ){
         mapValue.put("orderTypee", orderType);
-        if (con!=null||!"null".equals(con)){
+        if (con!=null && !"null".equals(con) && !"".equals(con)){
             mapValue.put("con",con);
         }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据

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

@@ -86,7 +86,6 @@
                             on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
                        left join RMS_CONSIGNEE RCON
                             on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-
               where OO.ORDER_STATUS in (5, 8, 9, 1, 2)
                 and OO.ORDER_TYPE = #{orderTypee}
                 <if test="oneDate != null">
@@ -357,12 +356,13 @@
         RM.MATERIAL_NAME "materialName",
         TLR.INSERT_UPDATE_REMARK "materialRemark",
         ASO.SALE_NUMBER "saleNumber",
+        ASM.SALE_WAREHOUSE "saleWarehouse",
         TLR.CASE_NUMBER "caseNumber",
         RC2.CARRIER_NAME "carrierName",
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
         TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialCode",
-        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK "likeRemark"
+        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK || ASM.SALE_WAREHOUSE "likeRemark"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -370,6 +370,10 @@
         on TTR.ORDER_ID = OO.ORDER_ID
         left join AMS_SALE_ORDER_MATERIAL ASOM
         on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        left join AMS_SALE_TRUCKNO_MATERIAL ASTM
+        on ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        left join AMS_SALE_MATERIAL ASM
+        on ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         left join AMS_DISPATCH_SALE_ORDER ADSO
         on ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
         left join RMS_CARRIER RC2