Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/command/NowReportHandle.php

@@ -460,7 +460,7 @@ class NowReportHandle extends Command
             ->leftJoin("good_basic wgb","wgb.spuCode=wpo.spuCode and wgb.is_del=0")
             ->leftJoin("supplier ws","ws.code=wpo.supplierNo")
             ->leftJoin("warehouse_info wwi","wwi.wsm_code = wpo.wsm_code")
-            ->where([['woo.status',">=", 2],['woo.is_del',"=",0],['a.order_type',"=", 1],'woo.sendtime',"between",[$start, $end]])
+            ->where([['woo.status',">=", 2],['woo.is_del',"=",0],['a.order_type',"=", 1],['woo.sendtime',"between",[$start, $end]]])
             ->field("wpo.companyNo '业务公司',
                             bkcode '备库单号',
                             woo.orderCode '销售单号',

app/common.php

@@ -1011,11 +1011,7 @@ if (!function_exists('excelSaveFile')) {
         }
 
         $file = $filename . ".xls";
-
-        $objPHPExcel->setActiveSheetIndex(0); // 设置活动单指数到第一个表,所以Excel打开这是第一个表
-
-        PHPExcel_Settings::setCacheStorageMethod(PHPExcel_CachedObjectStorageFactory::cache_in_memory_serialized);
-
+        $objPHPExcel->setActiveSheetIndex(0);
         $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
         $objWriter->save($dir . $file); // 文件通过浏览器下载
         $url = $dir . $file;