|
|
@@ -144,8 +144,8 @@ class Sale extends BaseController{
|
|
|
$invArr = Db::name("assoc")->alias("a")->leftJoin("invoice_good b","a.viceCode=b.invNo")
|
|
|
->where(["a.status"=>[1,2],"a.is_del"=>0,"a.type"=>1,"a.orderCode"=>$value['sequenceNo']])->group("a.status")
|
|
|
->column("sum(b.goodNum) as goodNum","a.status");
|
|
|
- $value['inv_num'] = $invArr[1]['goodNum']??0;
|
|
|
- $value['ainv_num'] = $invArr[2]['goodNum']??0;
|
|
|
+ $value['inv_num'] = $invArr[1]??0;
|
|
|
+ $value['ainv_num'] = $invArr[2]??0;
|
|
|
$value['winv_num'] =$value['goodNum']- $value['inv_num']-$value['ainv_num'];
|
|
|
$data[]=$value;
|
|
|
}
|
|
|
@@ -196,8 +196,8 @@ class Sale extends BaseController{
|
|
|
$qrdinfo['catInfo'] = json_decode($qrdinfo['catInfo'],true);
|
|
|
$tag =Db::name("tag_log")->alias("a")->leftJoin("order_tag b","a.tag_id=b.id")->where
|
|
|
(["code"=>$qrdinfo['sequenceNo'],"a.status"=>1])->column("b.tag_name","b.type");
|
|
|
- $qrdinfo['inv_tag_name']=$tag[4]['tag_name']??'';
|
|
|
- $qrdinfo['pay_tag_name']=$tag[3]['tag_name']??'';
|
|
|
+ $qrdinfo['inv_tag_name']=$tag[4]??'';
|
|
|
+ $qrdinfo['pay_tag_name']=$tag[3]??'';
|
|
|
return app_show(0,"获取成功",$qrdinfo);
|
|
|
}
|
|
|
|
