ad

app/command/Report.php

@@ -243,16 +243,16 @@ class Report extends Command
 		          DATE_FORMAT(a.addtime,\'%Y\') 年,
 		          DATE_FORMAT(a.addtime,\'%m\') 月,
 		          a.invoiceNumber 发票号,
+		          c.total 总额,
+		          c.subtotal_amount 金额,
+		          c.subtotal_tax 税额,		          
 		          a.open_time 开票日期,
 		          b.supplierName 供应商,
 		          a.invoiceType 发票类型,
 		          "" as 业务类型,
 		          a.status 认证状态,
 		          a.updatetime 认证时间,
-		          a.remark 备注,
-		          c.total 总额,
-		          c.subtotal_amount 金额,
-		          c.subtotal_tax 税额')
+		          a.remark 备注')
 		          ->where($where)
 		          ->order('a.addtime desc')
 		          ->cursor();
@@ -413,9 +413,11 @@ class Report extends Command
                     d.qrdCode 确认单编号,
                     d.bkCode 备库编号,
                     d.thNum 退货数量,
-                    d.th_fee 退货金额')
+                    d.th_fee 退货金额,
+                    a.exam_remark 回票审核备注,
+                    a.remark 回票申请备注')
 		          ->leftJoin('pay b', 'a.payNo=b.payNo')
-		          ->leftJoin('pay_info c', 'c.payNo=a.payNo')
+		          ->leftJoin('pay_info c', 'c.payNo=a.payNo and c.status=1 and c.is_del=0')
 		          ->leftJoin('cgd_info d', 'd.sequenceNo=c.cgdNo')
 		          ->leftJoin('invoice_info e', 'e.payNo=a.payNo')
 		          ->where($where)