|
|
@@ -838,18 +838,16 @@ class Report extends Command
|
|
|
DATE_FORMAT( a.createtime, '%Y' ) 年,
|
|
|
DATE_FORMAT( a.createtime, '%m' ) 月,
|
|
|
DATE_FORMAT( a.createtime, '%d' ) 日,
|
|
|
- a.createtime 退货创建时间,
|
|
|
- a.thNo 退货单号,
|
|
|
b.companyName 退货公司名称,
|
|
|
b.companyNo 退货公司编号,
|
|
|
- b.ownerName 销售员,
|
|
|
b.department 销售部门,
|
|
|
+ b.ownerName 销售员,
|
|
|
b.qrdSource 销售来源,
|
|
|
b.pay_source 支付渠道,
|
|
|
'' 活动类型,
|
|
|
b.sequenceNo 订单编号,
|
|
|
if(b.cxCode='',b.sequenceNo,b.cxCode) 销售订单编号,
|
|
|
- c.bkCode 备库编号,
|
|
|
+ a.thNo 退货单号,
|
|
|
b.cgdNo 采购单号,
|
|
|
b.platName 平台类型,
|
|
|
b.poCode 平台订单号,
|
|
|
@@ -877,13 +875,14 @@ class Report extends Command
|
|
|
c.goodPrice 采购单价,
|
|
|
round(a.th_num * ifnull(c.goodPrice,b.total_origin_price/b.goodNum),2) 退货采购货款,
|
|
|
c.tax 采购税点,
|
|
|
- c.supplierName 供应商名称,
|
|
|
if(b.isStock=1,'是','否') 是否库存,
|
|
|
+ c.supplierName 供应商名称,
|
|
|
c.sendType 发货方式,
|
|
|
if(a.is_th=1,'是','否') 供应商是否同意退货,
|
|
|
'' as 付款方式,
|
|
|
b.fundCode 财务核算码,
|
|
|
- a.th_remark 退货备注
|
|
|
+ a.th_remark 退货备注,
|
|
|
+ c.bkCode 备库单号
|
|
|
")->cursor();
|
|
|
foreach ($list as $value) {
|
|
|
$value['销售来源']= $this->qrdSource[$value['销售来源']]??"";
|
