|
@@ -209,14 +209,13 @@ class NowReportHandle extends Command
|
|
|
->leftJoin('business wb', ' ws.supplierNo=wb.companyNo')
|
|
|
->leftJoin('order_num won', 'won.orderCode=wtd.orderCode')
|
|
|
->leftJoin('purchease_order wpo', 'wpo.cgdNo=won.cgdNo')
|
|
|
- ->leftJoin('supplier wsp', 'wsp.`code`=wpo.supplierNo')
|
|
|
- ->leftJoin('business wb', 'ws.supplierNo=wb.companyNo')
|
|
|
+ ->leftJoin('supplier wps', 'wps.code=wpo.supplierNo')
|
|
|
->leftJoin('customer_info wci', 'wci.companyNo =ws.customer_code')
|
|
|
- ->whereBetween('ob.addtime', [$start_date, $end_date])
|
|
|
- ->field(" year(ifnull(wsr.addtime,wor.addtime)) '年',
|
|
|
- month(ifnull(wsr.addtime,wor.addtime)) '月',
|
|
|
- DAYOFMONTH(ifnull(wsr.addtime,wor.addtime)) '日',
|
|
|
- ifnull(wsr.addtime,wor.addtime) '退货单创建时间',
|
|
|
+ ->whereBetween('wtd.addtime', [$start_date, $end_date])
|
|
|
+ ->field(" year(wtd.addtime) '年',
|
|
|
+ month(wtd.addtime) '月',
|
|
|
+ DAYOFMONTH(wtd.addtime) '日',
|
|
|
+ wtd.addtime '退货单创建时间',
|
|
|
wb.company '公司名称',
|
|
|
thCode '退货单号',
|
|
|
'已完成' as '流程进度',
|
|
@@ -255,13 +254,13 @@ class NowReportHandle extends Command
|
|
|
wpo.supplier_name '供应商名称',
|
|
|
if(ws.is_stock=1,'是','否') '是否库存',
|
|
|
'' as '发货方式',
|
|
|
- if(wsp.pay_type='0','现结',if(wsp.pay_type='1','月清',if(wsp.pay_type='2','双月请',wsp.pay_type))) as '付款方式'")
|
|
|
- ->cursor();
|
|
|
+ if(wps.pay_type='0','现结',if(wps.pay_type='1','月结',if(wps.pay_type='2','双月结',wps.pay_type))) as '付款方式'
|
|
|
+
|
|
|
+ ")->cursor();
|
|
|
|
|
|
- $list = [];
|
|
|
+ $com = [];
|
|
|
foreach ($data as $value) {
|
|
|
-
|
|
|
- $value['业务部门'] = get_company_name_by_uid($value['业务部门']);
|
|
|
+ $value['业务部门'] = get_company_name_by_uid(intval($value['业务部门']));
|
|
|
$value['财务核算码']=Db::name("cat")->where(["id"=>$value['三级分类']])->value("fund_code",'');
|
|
|
$comp =get_top_customer_org($value['分公司']);
|
|
|
$value['客户属性']=isset($comp[0]['name'])?$comp[0]['name']:"";
|
|
@@ -275,13 +274,13 @@ class NowReportHandle extends Command
|
|
|
}else{
|
|
|
$good= Db::name("good_basic")->where(["spuCode"=>$value['产品编码']])->find();
|
|
|
}
|
|
|
- $value['单位']=isset($good['good_unit'])?Db::name("unit")->where(["id"=>$value['good_unit']])->value('unit',''):"";
|
|
|
+ $value['单位']=isset($good['good_unit'])?Db::name("unit")->where(["id"=>$good['good_unit']])->value('unit',''):"";
|
|
|
$value['税率']=isset($good['tax'])?$good['tax'].'%':"";
|
|
|
$value['平台类型']= Db::name("platform")->where(["id"=>$value['平台类型']])->value("platform_name",'');
|
|
|
- yield $list[] = $value;
|
|
|
+ yield $com[] = $value;
|
|
|
}
|
|
|
|
|
|
- return $list;
|
|
|
+ return $com;
|
|
|
|
|
|
}
|
|
|
|