wugg 2 years ago
parent
commit
d324894929
2 changed files with 2 additions and 1 deletions
  1. 1 0
      app/admin/controller/Sale.php
  2. 1 1
      app/admin/controller/Stat.php

+ 1 - 0
app/admin/controller/Sale.php

@@ -4326,6 +4326,7 @@ class Sale extends Base
             ->leftJoin('purchease_order c', 'c.cgdNo=b.cgdNo')
             ->where([
                 ['a.is_del', '=', 0],
+                ['c.order_type', '<>', 1],
                 ['a.outCode', 'in', array_column($param['list'], 'outCode')],
             ])->column('c.supplierNo', 'a.outCode');
 

+ 1 - 1
app/admin/controller/Stat.php

@@ -89,7 +89,7 @@ FROM
 				k.itemid = c.id 
 			     and f.is_del=0
 				AND f.platform_id = a.platform_id 
-				AND WEEK ( f.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
+				AND WEEK ( e.addtime, 1 ) = WEEK ( '$endtime', 1 ) 
 				AND DATE_FORMAT ( e.addtime, '%Y' ) = DATE_FORMAT ( '$endtime', '%Y' )) AS week_thfee,
 		a.platform_id,
 		c.`name`,