wugg 6 mesiacov pred
rodič
commit
303c8e287e

+ 4 - 5
app/admin/controller/Payment.php

@@ -2323,15 +2323,14 @@ class Payment extends Base
 		b.goodUnit '单位',(b.goodNum-b.thNum) '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',
 		if(b.cxCode='',b.qrdCode,b.cxCode) 销售主单号,b.goodNo 商品编码,b.goodName 商品名称,c.cat_name 货物和劳务名称,c.merge_code 商品开票类目,c.short_name 商品和服务分类简称,
 		c.tax/100  开票税率,c.inv_good_name 开票商品名称,if(b.open_type =1,'原商品开票',if(b.open_type =2,'子商品开票','')) 开票类型")
-		->select()
-		->toArray();
+		->select()->toArray();
+
 		if(empty($cgdlist))$cgdlist=["暂无数据"=>''];
 		else{
-		    $cgdlist->each(function (&$item){
-                    $item['采购单可关联金额']= bcsub($item['总货款'],InvoiceOrder::getInvoiceOrderTotalFee($item['采购单编号']),2);
+		    array_walk($cgdlist, function (&$item) {
+                $item['采购单可关联金额']= bcsub($item['总货款'],InvoiceOrder::getInvoiceOrderTotalFee($item['采购单编号']),2);
             });
 		}
-
 		excelExport("{$param['payNo']}对账采购单详情",array_keys($cgdlist[0]),$cgdlist);
 	}
 		/** 导出对账单采购单信息

+ 1 - 1
app/admin/model/InvoiceOrder.php

@@ -18,7 +18,7 @@ class InvoiceOrder extends \think\Model{
     }
     public static function getInvoiceOrderTotalFee($code){
         $banance =  (new InvoiceOrder)->where(['code'=>$code,'status'=>[1,2]])->field('sum(ifnull(total_amount-balance_amount,0)) as total_amount')->find();
-        return $banance['total_amount'];
+        return $banance['total_amount']??0;
     }
 
     public function getMergeCodeAttr($value,$data){