ad

app/admin/controller/Sale.php

@@ -3456,17 +3456,18 @@ class Sale extends Base
 //                    $role['write']) . ")";
 //        }
 
-//        $role = $this->checkDataShare();
-//        if (!empty($role[DataGroupModel::$type_全部])) $condition .= " (b.is_stock=1 and n.contactor = {$this->uid}) or (b.is_stock=0 and wpo.cgder_id = {$this->uid}) or a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . ")";
 
         //库管只能看到库存品订单，供应商负责人只能看到非库存品订单
         if(!in_array($this->roleid,[1,33])){
             //库管看到所有的库存品发货申请单
             if(in_array($this->roleid,config('app.wsm_cgder_role'))) $condition .="b.is_stock=1";
             else{
+            	$role = $this->checkDataShare();
+                if (!empty($role[DataGroupModel::$type_全部])) $condition .= " a.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . ")";
+
                 $personid=Db::name('supplier')->field('id')->where(['is_del'=>0,'personid'=>$this->uid])->findOrEmpty();
-                if($personid)$condition.="(b.is_stock=0 and sip.personid = {$this->uid})";//供应商负责人能看到非库存品的单子
-                else $condition.="a.apply_id = {$this->uid}";//其他只能看到自己创建的单子
+                if($personid)$condition.=" or (b.is_stock=0 and sip.personid = {$this->uid})";//供应商负责人能看到非库存品的单子
+//                else $condition.="a.apply_id = {$this->uid}";//其他只能看到自己创建的单子
             }
         }
 //        if(!empty($role['platform']) ){

app/command/NowReportHandle.php

@@ -304,6 +304,11 @@ class NowReportHandle extends Command
             	$returninfo = Db::name("return_info")->where(["returnCode"=>$value['thCode']])->field("sum(origin_price * num) as cgd_total")->find();
             	$value['退货采购货款'] = $returninfo['cgd_total']??0;
             }
+            if($value['采购员']=='' ||$value['供应商名称']==''){
+            	$supplier= Db::name("supplier")->where(["code"=>$good['supplierNo']])->field("name,person")->find();
+            	$value['采购员']=$supplier['person']??'';
+            	$value['供应商名称']=$supplier['name']??'';
+            }
             $value['单位']=isset($good['good_unit'])?Db::name("unit")->where(["id"=>$good['good_unit']])->value('unit',''):"";
             $value['税点']=isset($good['tax'])?$good['tax'].'%':"";
             $value['平台类型']= Db::name("platform")->where(["id"=>$value['平台类型']])->value("platform_name",'');