|
|
@@ -2003,23 +2003,7 @@ class OrderInv extends BaseController{
|
|
|
$temp['num'] =$good['goodNum'];
|
|
|
$temp['price'] =$good['goodPrice'];
|
|
|
$temp['total_fee'] =$good['totalPrice'];
|
|
|
- switch ($value['inv_type']){
|
|
|
- case 1:
|
|
|
- $temp['inv_type'] = "增值税专用发票";
|
|
|
- break;
|
|
|
- case 2:
|
|
|
- $temp['inv_type'] = "增值税普通发票";
|
|
|
- break;
|
|
|
- case 3:
|
|
|
- $temp['inv_type'] = "增值税电子专用发票";
|
|
|
- break;
|
|
|
- case 4:
|
|
|
- $temp['inv_type'] = "增值税电子普通发票";
|
|
|
- break;
|
|
|
- default:
|
|
|
- $temp['inv_type'] = "-";
|
|
|
- break;
|
|
|
- }
|
|
|
+ $temp['inv_type'] =$this->typename[$value['inv_type']];
|
|
|
// $temp['inv_type'] = $value['inv_type']==1?"增值税专用发票": "增值税普通发票";
|
|
|
// $temp['inv_value'] =$value['inv_value'];
|
|
|
$temp['remark'] =$value['remark'];
|
|
|
@@ -2120,7 +2104,9 @@ class OrderInv extends BaseController{
|
|
|
Db::startTrans();
|
|
|
try{
|
|
|
$keyarr =array_keys($total);
|
|
|
- $inpool = Db::name("invoice_pool")->where([["invNo","in",$keyarr],["open_type","in",[2,3]],["is_del","=",0],["status","=",0]])->column("winv_fee","invNo");
|
|
|
+ $inpool = Db::name("invoice_pool")->where([["invNo","in",$keyarr],["open_type","in",[2,3]],["is_del","=",
|
|
|
+ 0],["status","=",0]])->column("winv_fee,invNo,inv_value","invNo");
|
|
|
+
|
|
|
foreach ($total as $key=>$value){
|
|
|
if(!isset($inpool[$key])) continue;
|
|
|
if($inpool[$key]['winv_fee']> $value['total']){
|
