|
|
@@ -796,7 +796,7 @@ class Report extends Command
|
|
|
diff_fee '工差金额',
|
|
|
goodNum '商品数量',
|
|
|
totalPrice '总价',
|
|
|
- sendStatus '发货状态',
|
|
|
+ qrdSend '发货状态',
|
|
|
'' as '对账编号',
|
|
|
'' as '付款状态',
|
|
|
'' as '回票状态'
|
|
|
@@ -813,7 +813,7 @@ class Report extends Command
|
|
|
$value['付款状态'] = $this->cgd_pay_status[$payinfo['pay_status'] ?? "1"];
|
|
|
$value['回票状态'] = $this->cgd_inv_status[$payinfo['inv_status'] ?? "1"];
|
|
|
$value['是否库存'] = $value['是否库存']==1?'是':'否';
|
|
|
- $value['发货状态'] = $this->sendStatus[$value['发货状态']];
|
|
|
+ $value['发货状态'] = $this->sendStatus[$value['发货状态']]??"未发货";
|
|
|
yield $value;
|
|
|
}
|
|
|
}
|
|
|
@@ -1077,7 +1077,7 @@ class Report extends Command
|
|
|
$totalPrice=$value['回款金额'];
|
|
|
$value['账期回款系数']=getPayRate($value['账期']);
|
|
|
$value['一级类型']='常规分类';
|
|
|
- $value['提成系数']=0.0036;
|
|
|
+ $value['提成系数']=0.005;
|
|
|
if(in_array($value['一级分类'],$normal)) {
|
|
|
$value['一级类型']='非常规分类';
|
|
|
$value['提成系数']=0.0002;
|
