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

app/admin/controller/SaleReport.php

@@ -2002,9 +2002,10 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,c.use_type')
-            ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
-            ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
+            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,p.use_type')
+            ->leftJoin("order_num b", "b.cgdNo=a.cgdNo")
+            ->leftJoin("sale s", "s.orderCode=b.orderCode AND s.is_del=0")
+            ->leftJoin("platform p", "p.id=s.platform_id AND p.is_del=0")
             ->where($where)
             ->cursor();
         $list = $tmp = [];
@@ -2039,8 +2040,10 @@ class SaleReport extends Base
 
                 case 3:
                     //咨询采反
-                    $list[$val['supplierNo']]['tag_zx']++;
-                    $total['tag_zx']++;
+                    if ($val['order_source'] == 2) {
+                        $list[$val['supplierNo']]['tag_zx']++;
+                        $total['tag_zx']++;
+                    }
                     break;
             }
 
@@ -2087,9 +2090,10 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,c.use_type')
-            ->leftJoin("good_platform b", "b.skuCode=a.skuCode AND b.is_del=0")
-            ->leftJoin("platform c", "c.id=b.platform_code AND c.is_del=0")
+            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,a.order_source,p.use_type')
+            ->leftJoin("order_num b", "b.cgdNo=a.cgdNo")
+            ->leftJoin("sale s", "s.orderCode=b.orderCode AND s.is_del=0")
+            ->leftJoin("platform p", "p.id=s.platform_id AND p.is_del=0")
             ->where($where)
             ->cursor();
         $list = $tmp = [];
@@ -2125,8 +2129,10 @@ class SaleReport extends Base
 
                 case 3:
                     //咨询采反
-                    $list[$val['supplierNo']]['反馈单数合计']++;
-                    $total['反馈单数合计']++;
+                    if ($val['order_source'] == 2) {
+                        $list[$val['supplierNo']]['反馈单数合计']++;
+                        $total['反馈单数合计']++;
+                    }
                     break;
             }