d

app/admin/controller/Company.php

@@ -53,6 +53,8 @@ class Company extends BaseController
         if(empty($supplierinfo)){
         	return error_show(1004,"未找到企业信息");
         }
+        $isIn =Db::name("company_info")->where(["companyNo"=>$companyNo,"is_del"=>0])->findOrEmpty();
+        if(!empty($isIn))return error_show(1004,"财务信息已存在！");
         $name = isset($post['company_name'])&&$post['company_name']!="" ? trim($post['company_name']) :"";
         if($name==""){
             return error_show(1004,"参数company_name 不能为空");

app/admin/controller/OrderInv.php

@@ -2091,9 +2091,9 @@ class OrderInv extends BaseController{
             if($value["inv_number"]==""){
                 return error_show(1005,"第".($key+1)."行缺少发票号码数据");
             }
-            if($value["inv_total"]==""){
-                return error_show(1005,"第".($key+1)."行缺少发票金额数据");
-            }
+//            if($value["inv_total"]==""){
+//                return error_show(1005,"第".($key+1)."行缺少发票金额数据");
+//            }
              if($value["inv_subtotal"]==""){
                 return error_show(1005,"第".($key+1)."行缺少发票税后金额数据");
             }
@@ -2113,7 +2113,7 @@ class OrderInv extends BaseController{
             $temp['inv_code'] = $value['inv_code'];
             $temp['inv_number'] = $value['inv_number'];
             $temp['inv_subtotal'] = $value['inv_subtotal'];
-            $temp['inv_total'] = $value['inv_total'];
+//            $temp['inv_total'] = $value['inv_total'];
             $temp['check_code'] = $value['check_code']??"";
             $temp['item'] = '';
             $temp['pdfstream'] = '';
@@ -2122,21 +2122,20 @@ class OrderInv extends BaseController{
             $temp['is_del'] = 0;
             $temp['addtime'] = date("Y-m-d H:i:s");
             $temp['updatetime'] = date("Y-m-d H:i:s");
-            $total[$value["invNo"]]['total']+=$value['inv_total'];
+//            $total[$value["invNo"]]['total']+=$value['inv_total'];
             $total[$value["invNo"]]['list'][]=$temp;
         }
 
 		 Db::startTrans();
 		 try{
 		 	$keyarr =array_keys($total);
-		 	$inpool = Db::name("invoice_pool")->where([["invNo","in",$keyarr],["open_type","in",[0,2,3]],["is_del","=",
-		 	0],["status","=",0]])->column("winv_fee,invNo,inv_value","invNo");
+		 	$inpool = Db::name("invoice_pool")->where([["invNo","in",$keyarr],["open_type","in",[0,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']){
-					throw new Exception("{$key}票面金额小于未开票金额");
-				}
+//				if($inpool[$key]['winv_fee']> $value['total']){
+//					throw new Exception("{$key}票面金额小于未开票金额");
+//				}
 				$list=array_merge($list,$value['list']);
 				$update=[
 					"status"=>2,