ad

app/admin/controller/Sale.php

@@ -3537,18 +3537,18 @@ class Sale extends Base
         //只有level2的账号过滤数据权限
         if ($this->level == 2) {
 
-            //如果是供应商负责人，根据供应商筛选
-            $person_supplier = Db::connect('mysql_sys')
-                ->name('supplier')
-                ->where(['is_del' => 0, 'personid' =>$this->uid])
-                ->column('code');
-
-            if(!empty($person_supplier)) $condition = "b.supNo in ('" . implode('\',\'', $person_supplier) . "')";
-            else{
+//            //如果是供应商负责人，根据供应商筛选
+//            $person_supplier = Db::connect('mysql_sys')
+//                ->name('supplier')
+//                ->where(['is_del' => 0, 'personid' =>$this->uid])
+//                ->column('code');
+//
+//            if(!empty($person_supplier)) $condition = "b.supNo in ('" . implode('\',\'', $person_supplier) . "')";
+//            else{
                 //不是供应商负责人，根据数据权限筛选申请人
                 $role = $this->checkDataShare();
                 if (!empty($role[DataGroupModel::$type_全部])) $condition = " a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . ")";
-            }
+//            }
 
 
 //            $hand = resign_hand_user($this->uid, 0);

app/admin/controller/SaleReport.php

@@ -3269,7 +3269,7 @@ class SaleReport extends Base
            ->where($where)
             ->order('a.addtime', 'desc')
 	        ->group("a.good_code")
-          ->field("a.good_code 商品编号,a.good_name 产品名称,a.good_num 当日库存销售,a.is_stock,a.send_num 当日库存发货,0 当日剩余可用库存,a.supplierName 业务公司,po.good_price 库存采购单价,po.total_fee 当日库存消耗金额")
+          ->field("a.good_code 商品编号,a.good_name 产品名称,sum(a.good_num) 当日库存销售,a.is_stock,sum(a.send_num) 当日库存发货,0 当日剩余可用库存,a.supplierName 业务公司,po.good_price 库存采购单价,sum(po.total_fee) 当日库存消耗金额")
           ->cursor();
 		$data=[];
 		foreach ($list as $value){