|
|
@@ -2279,9 +2279,12 @@ class Payment extends Base
|
|
|
if(empty($payinfo)) return error_show(1005,'对账单信息未找到');
|
|
|
$cgdlist =Db::name("pay_info")->alias("a")
|
|
|
->leftJoin("cgd_info b","a.cgdNo=b.sequenceNo")
|
|
|
+ ->leftJoin("order_category c","a.cgdNo=c.code and order_type=2 and ((c.open_type=1 and c.spuCode==b.goodNo )or (c.open_type=2 and c.spuCode<>b.goodNo)")
|
|
|
->where(["a.payNo"=>$param['payNo'],"a.status"=>1,"a.is_del"=>0])
|
|
|
->field("a.payNo'对账单号',b.sequenceNo '采购单编号',b.qrdCode '销售单编号',b.supplierName '供货商',b.companyName '业务公司',
|
|
|
- b.goodName '商品名称',b.goodUnit '单位',(b.goodNum-b.thNum) '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',b.tax/100 '税率',if(b.cxCode='',b.qrdCode,b.cxCode) 销售主单号")
|
|
|
+ b.goodName '商品名称',b.goodUnit '单位',(b.goodNum-b.thNum) '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',b.tax/100 '税率',
|
|
|
+ if(b.cxCode='',b.qrdCode,b.cxCode) 销售主单号,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();
|
|
|
if(empty($cgdlist))$cgdlist=["暂无数据"=>''];
|
