ad

app/admin/controller/ComonOrder.php

@@ -332,9 +332,22 @@ class ComonOrder extends Base
         if($company->isEmpty())$this->error('订单业务公司开票信息未找到');
          $customer = CompanyInfo::whereIn('companyNo',array_keys($customerArr))->findOrEmpty();
         if($customer->isEmpty())$this->error('订单客户公司开票信息未找到');
-        if($company['denomination']!=''&& $invfee>intval($company['denomination'])*10000){
-           $this->error("开票面额不能超过{$company['denomination']}万元");
-        }
+        if (in_array($param['invtype'] ,
+        		   [
+        			   'fully_digitalized_special_electronic' ,
+        			   'fully_digitalized_normal_electronic'
+        		   ]
+        	   )) {
+        		   //全电发票限制金额
+        		   if ($invfee > 10000000) {
+        		   	$this->error('开票面额不能超过一千万元');
+        		   }
+        	   }
+        	   else {//全电发票
+        		   if ($company['denomination'] != '' && $invfee > intval($company['denomination']) * 10000) {
+        			   $this->error( "开票面额不能超过{$company['denomination']}万元");
+        		   }
+        	   }
         $platform = array_column($qrdinfo,'platform_type');
         if(count(array_unique($platform))!=1){
         	$this->error("订单平台类型不一致");

app/admin/controller/OrderInv.php

@@ -72,9 +72,18 @@ class OrderInv extends Base{
         $good=[];
         $invNo=makeNo("INV");
         $invfee=array_sum(array_column($orderArr,'inv_fee'));
-        if($company['denomination']!=''&& $invfee>intval($company['denomination'])*10000){
-                return error_show(1004,"开票面额不能超过{$company['denomination']}万元");
+       if(in_array($invtype,['fully_digitalized_special_electronic','fully_digitalized_normal_electronic'])){
+	           	     //全电发票限制金额
+        		   if ($invfee > 10000000) {
+        		   	$this->error('开票面额不能超过一千万元');
+        		   }
+        	   }
+        	   else {//全电发票
+        		   if ($company['denomination'] != '' && $invfee > intval($company['denomination']) * 10000) {
+        			   $this->error( "开票面额不能超过{$company['denomination']}万元");
+        		   }
         }
+        
         $platform = array_column($orderArr,'platform_type');
         if(count(array_unique($platform))!=1){
             return error_show(1004,"订单平台类型不一致");

app/admin/controller/Payment.php

@@ -2196,7 +2196,7 @@ class Payment extends Base
 		->leftJoin("cgd_info b","a.cgdNo=b.sequenceNo")
 		->where(["a.payNo"=>$param['payNo'],"a.status"=>1,"a.is_del"=>0])
 		->field("a.payNo'对账单号',b.sequenceNo '采购单编号',b.qrdCode '销售单编号',b.supplierName '供货商',b.companyName '业务公司',
-		b.goodName '商品名称',b.goodUnit '单位',b.goodNum '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',b.tax/100 '税率',if(b.cxCode='',b.qrdCode,b.cxCode) 销售主单号")
+		b.goodName '商品名称',b.goodUnit '单位',(b.goodNum-b.thNum) '商品数量',b.goodPrice'商品单价',b.totalPrice'总货款',b.tax/100 '税率',if(b.cxCode='',b.qrdCode,b.cxCode) 销售主单号")
 		->select()
 		->toArray();
 		if(empty($cgdlist))$cgdlist=["暂无数据"=>''];

app/admin/controller/Track.php

@@ -73,6 +73,11 @@ class Track extends Base
         $param['status']==''?:$where[]=["status","=",$param['status']];
         $list=$this->model->with(['fhdChild'])->where($where)->order("id desc")->paginate(["list_rows"=>$param['size'],
         "page"=>$param['page']]);
+        $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list->items(),'supplierNo')));
+         foreach ($list->items() as &$value){
+            $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
+            
+        }
         $this->success("获取成功",["list"=>$list->items(),"count"=>$list->total()]);
     }
     

app/admin/listener/ComonQrd.php

@@ -125,8 +125,8 @@ class ComonQrd
     	    		    $temp['quantity']=$item['SPSL'];
     	    		    $temp['unit_price']=$item['DJ'];
     	    		    $temp['amount']=$item['JE'];
-    	    		    $temp['tax_rate']=$item['SE'];
-    	    		    $temp['tax']=strval($item['SL']*100)."%";
+    	    		    $temp['tax']=$item['SE'];
+    	    		    $temp['tax_rate']=strval($item['SL']*100)."%";
     				    $itemArr[]=$temp;
     			    }
     		    }

app/command/handleCxData.php

@@ -283,7 +283,7 @@ class handleCxData extends command
 							    'diff_weight'=>$data['diff_weight'] ,//工差重量,
 							    'diff_fee'=>$data['diff_fee'] ,//工差金额,
 							    'area'=>$data['customer_name'] ,//公司,
-							    'customerAttr'=>$all_branch[$data['customer_code']]['parent'] ,//客户属性,
+							    'customerAttr'=>$all_branch[$data['customer_code']]['parent']??"" ,//客户属性,
 							    'branch'=>$all_branch[$data['customer_code']]['branch'] ?? '' ,//分公司,从客户表中查
 							    'cgdNo'=>$data['cgdNo'] ,//采购单号,
 							    'thNum'=>$data['th_num'] ,//退货数量,