Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/command/NowReportHandle.php

@@ -619,7 +619,7 @@ class NowReportHandle extends Command
             ->leftJoin('company_item ci', 'ci.id=u.itemid')
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
             ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
-            ->where('s.is_del', 0)
+            ->where(['s.is_del' => 0, 'u.is_del' => 0])
             ->whereBetween('s.addtime', [$start_date, $end_date])
             ->order('s.addtime', 'desc')
             ->cursor();