agsd

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

@@ -395,10 +395,9 @@ public class StatisticalReportController extends BaseRESTfulController {
                                               String startTime,
                                               String endTime,
                                               String orgCode,
-                                               String isPage,
+                                                String isPage,
                                              String index
     ){
-
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }

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

@@ -362,7 +362,7 @@
         TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
         TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
         RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialCode",
-        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK || ASM.SALE_WAREHOUSE "likeRemark"
+        RM.MATERIAL_NAME  || TLR.INSERT_UPDATE_REMARK || ASM.SALE_WAREHOUSE || RW.WAREHOUSE_NAME "likeRemark"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID