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

app/admin/controller/SaleReport.php

@@ -1894,11 +1894,12 @@ class SaleReport extends Base
                     //库存品,物流岗发
                     $list[$val['cat_id']]['tag_logistics']++;
                     break;
-                case 2:
-                    //非库存品
+                case 2: //非库存品
+                case 3: //咨询采反
                     if (in_array($val['supplierNo'], $supplierNos)) $list[$val['cat_id']]['tag_supplier']++;
                     else $list[$val['cat_id']]['tag_person']++;
                     break;
+
             }
 
             $list[$val['cat_id']]['tag_' . $val['order_type']]++;
@@ -1971,6 +1972,8 @@ class SaleReport extends Base
                     break;
                 case 3:
                     $list[$val['cat_id']]['咨询采反']++;
+                    if (in_array($val['supplierNo'], $supplierNos)) $list[$val['cat_id']]['供应商发货']++;
+                    else $list[$val['cat_id']]['负责人发货']++;
 //                    $total['咨询采反']++;
                     break;
             }
@@ -1999,13 +2002,13 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,c.use_type')
+            ->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")
             ->where($where)
             ->cursor();
         $list = $tmp = [];
-        $total = ['supplier_name' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
+        $total = ['supplier_name' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_2' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
         foreach ($data as $val) {
 
             if (!isset($list[$val['supplierNo']])) {
@@ -2013,6 +2016,7 @@ class SaleReport extends Base
                     'supplier_name' => $val['supplier_name'],
                     'total_cgd' => 0,//订单总量
                     'tag_1' => 0,//库存品
+                    'tag_2' => 0,//非库存品
                     'tag_c' => 0,//to C
                     'tag_b' => 0,//to B
                     'tag_zx' => 0,//咨询采反总数
@@ -2022,10 +2026,17 @@ class SaleReport extends Base
             switch ($val['order_type']) {
                 case 1:
                     //库存品
-                    $list[$val['supplierNo']]['tag_1']++;
-                    $total['tag_1']++;
+                    if ($val['order_source'] == 0) {
+                        $list[$val['supplierNo']]['tag_1']++;
+                        $total['tag_1']++;
+                    }
                     break;
 
+                case 2:
+                    //非库存品
+                    $list[$val['supplierNo']]['tag_2']++;
+                    $total['tag_2']++;
+
                 case 3:
                     //咨询采反
                     $list[$val['supplierNo']]['tag_zx']++;
@@ -2076,13 +2087,13 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,a.supplierNo,a.supplier_name,a.order_type,c.use_type')
+            ->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")
             ->where($where)
             ->cursor();
         $list = $tmp = [];
-        $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, 'toC' => 0, 'toB' => 0, '今日反馈单数合计(参考)' => 0];
+        $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, '非库存品' => 0, 'toC' => 0, 'toB' => 0, '反馈单数合计' => 0];
         foreach ($data as $val) {
 
             if (!isset($list[$val['supplierNo']])) {
@@ -2090,23 +2101,32 @@ class SaleReport extends Base
                     '采购方' => $val['supplier_name'],
                     '订单总量' => 0,//订单总量
                     '库存品' => 0,//库存品
+                    '非库存品' => 0,//非库存品
                     'toC' => 0,//to C
                     'toB' => 0,//to B
-                    '今日反馈单数合计(参考)' => 0,//咨询采反总数
+                    '反馈单数合计' => 0,//咨询采反总数
                 ];
             }
 
             switch ($val['order_type']) {
                 case 1:
                     //库存品
-                    $list[$val['supplierNo']]['库存品']++;
-                    $total['库存品']++;
+                    if ($val['order_source'] == 0) {
+                        $list[$val['supplierNo']]['库存品']++;
+                        $total['库存品']++;
+                    }
+                    break;
+
+                case 2:
+                    //非库存品
+                    $list[$val['supplierNo']]['非库存品']++;
+                    $total['非库存品']++;
                     break;
 
                 case 3:
                     //咨询采反
-                    $list[$val['supplierNo']]['今日反馈单数合计(参考)']++;
-                    $total['今日反馈单数合计(参考)']++;
+                    $list[$val['supplierNo']]['反馈单数合计']++;
+                    $total['反馈单数合计']++;
                     break;
             }
 
@@ -2155,14 +2175,14 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,s.personid,s.person,a.order_type,c.use_type')
+            ->field('a.id,s.personid,s.person,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")
             ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
             ->where($where)
             ->cursor();
         $list = [];
-        $total = ['person' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
+        $total = ['person' => '总计', 'total_cgd' => 0, 'tag_1' => 0, 'tag_2' => 0, 'tag_c' => 0, 'tag_b' => 0, 'tag_zx' => 0];
         foreach ($data as $val) {
 
             if (!isset($list[$val['personid']])) {
@@ -2170,6 +2190,7 @@ class SaleReport extends Base
                     'person' => $val['person'],
                     'total_cgd' => 0,//订单总量
                     'tag_1' => 0,//库存品
+                    'tag_2' => 0,//非库存品
                     'tag_c' => 0,//to C
                     'tag_b' => 0,//to B
                     'tag_zx' => 0,//咨询采反总数
@@ -2179,8 +2200,15 @@ class SaleReport extends Base
             switch ($val['order_type']) {
                 case 1:
                     //库存品
-                    $list[$val['personid']]['tag_1']++;
-                    $total['tag_1']++;
+                    if ($val['order_source'] == 0) {
+                        $list[$val['personid']]['tag_1']++;
+                        $total['tag_1']++;
+                    }
+                    break;
+                case 2:
+                    //非库存品
+                    $list[$val['personid']]['tag_2']++;
+                    $total['tag_2']++;
                     break;
 
                 case 3:
@@ -2239,14 +2267,14 @@ class SaleReport extends Base
 
         $data = Db::name('purchease_order')
             ->alias('a')
-            ->field('a.id,s.personid,s.person,a.order_type,c.use_type')
+            ->field('a.id,s.personid,s.person,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")
             ->leftJoin("supplier s", "s.code=a.supplierNo AND s.is_del=0")
             ->where($where)
             ->cursor();
         $list = [];
-        $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, 'toC' => 0, 'toB' => 0, '今日反馈单数合计(参考)' => 0];
+        $total = ['采购方' => '总计', '订单总量' => 0, '库存品' => 0, '非库存品' => 0, 'toC' => 0, 'toB' => 0, '反馈单数合计' => 0];
         foreach ($data as $val) {
 
             if (!isset($list[$val['personid']])) {
@@ -2254,23 +2282,33 @@ class SaleReport extends Base
                     '采购方' => $val['person'],
                     '订单总量' => 0,//订单总量
                     '库存品' => 0,//库存品
+                    '非库存品' => 0,//非库存品
                     'toC' => 0,//to C
                     'toB' => 0,//to B
-                    '今日反馈单数合计(参考)' => 0,//咨询采反总数
+                    '反馈单数合计' => 0,//咨询采反总数
                 ];
             }
 
             switch ($val['order_type']) {
                 case 1:
                     //库存品
-                    $list[$val['personid']]['库存品']++;
-                    $total['库存品']++;
+                    if ($val['order_source'] == 0) {
+                        $list[$val['personid']]['库存品']++;
+                        $total['库存品']++;
+                    }
+
+                    break;
+
+                case 2:
+                    //非库存品
+                    $list[$val['personid']]['非库存品']++;
+                    $total['非库存品']++;
                     break;
 
                 case 3:
                     //咨询采反
-                    $list[$val['personid']]['今日反馈单数合计(参考)']++;
-                    $total['今日反馈单数合计(参考)']++;
+                    $list[$val['personid']]['反馈单数合计']++;
+                    $total['反馈单数合计']++;
                     break;
             }