|
@@ -47,7 +47,7 @@ class Export extends BaseController
|
|
|
->leftJoin('invoice_pool_info b', 'a.invNo=b.invNo')
|
|
|
->leftJoin('invoice_ticket c', 'a.invNo=c.invNo and c.type=0')
|
|
|
->leftJoin('invoice_good d', 'd.invNo=a.invNo')
|
|
|
- ->leftJoin('assoc e', 'e.orderCode=d.orderCode AND e.status=1 AND e.is_del=0')
|
|
|
+ ->leftJoin('assoc e', 'e.orderCode=d.orderCode AND e.status in (1,2) AND e.is_del=0')
|
|
|
->leftJoin('qrd_info f', 'f.sequenceNo=e.orderCode')
|
|
|
->leftJoin('good g', 'g.spuCode=d.goodNo')
|
|
|
->withAttr('开票方式', function ($val) use ($open_type) {
|