|
|
@@ -953,7 +953,7 @@ class OrderInv extends BaseController{
|
|
|
->where($condition)->page($page,$size)->field("a.*,c.buyer_title,c.buyer_code,c.buyer_addr,c.buyer_mobile,c.buyer_bank,
|
|
|
c.buyer_bankNo,c.seller_title,c.seller_code,c.seller_addr,c.seller_mobile,c.seller_bank,c.seller_bankNo,c.voider,c.payee,
|
|
|
c.drawer,c.reviewer,c.ownerPlace,b.inv_value,b.inv_out,b.inv_type,b.open_type,is_ticket,b.email,
|
|
|
- b.winv_fee,b.ainv_fee,b.post_fee,b.post_company,b.post_code")->select()->toArray();
|
|
|
+ b.winv_fee,b.ainv_fee,b.post_fee,b.post_company,b.post_code")->order("id desc")->select()->toArray();
|
|
|
foreach ($list as &$value){
|
|
|
$company =Db::name("company_info")->where(["companyNo"=>$value['inv_out']])->find();
|
|
|
$value['companyName'] = $company['company_name']??"";
|
|
|
@@ -986,7 +986,7 @@ class OrderInv extends BaseController{
|
|
|
catNo as SPBM,
|
|
|
goodNo as ZXBM,
|
|
|
is_discount as YHZCBS,
|
|
|
- inv_tag as LSLBS,
|
|
|
+ if(inv_tag=0,'',inv_tag) as LSLBS,
|
|
|
addTax as ZZSTSGL,
|
|
|
goodName as XMMC,
|
|
|
unitName as DW,
|
|
|
@@ -1101,7 +1101,7 @@ class OrderInv extends BaseController{
|
|
|
];
|
|
|
$redticketList=[];
|
|
|
foreach ($invfo as $value){
|
|
|
- if(!in_array($invfo['status'],[1,2,3,4,5])){
|
|
|
+ if(!in_array($value['status'],[1,2,3,4,5])){
|
|
|
Db::rollback();
|
|
|
return error_show(1004,"发票数据状态无法申请");
|
|
|
}
|
|
|
@@ -1116,7 +1116,7 @@ class OrderInv extends BaseController{
|
|
|
catNo as SPBM,
|
|
|
goodNo as ZXBM,
|
|
|
is_discount as YHZCBS,
|
|
|
- inv_tag as LSLBS,
|
|
|
+ if(inv_tag=0,'',inv_tag) as LSLBS,
|
|
|
addTax as ZZSTSGL,
|
|
|
goodName as XMMC,
|
|
|
unitName as DW,
|
