wugg il y a 2 ans
Parent
commit
273629d5c3
2 fichiers modifiés avec 18 ajouts et 18 suppressions
  1. 15 15
      app/admin/controller/OrderInv.php
  2. 3 3
      app/admin/controller/Supplier.php

+ 15 - 15
app/admin/controller/OrderInv.php

@@ -2143,21 +2143,21 @@ class OrderInv extends BaseController{
             if($value["check_code"]=="" && in_array($invtype,["026","028"])){
                 return error_show(1005,"第".($key+1)."行缺少发票校验码数据");
             }
-            if($value['inv_type']==="000"){
-            	if($value['seller_id']=="") return error_show(1005,"第".($key+1)."行缺少销售方纳税识别号数据");
-            	if($value['seller_title']=="") return error_show(1005,"第".($key+1)."行缺少销售方名称数据");
-            	if($value['seller_addr']=="") return error_show(1005,"第".($key+1)."行缺少销售方地址数据");
-            	if($value['seller_mobile']=="") return error_show(1005,"第".($key+1)."行缺少销售方联系方式数据");
-            	if($value['seller_bank']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行数据");
-            	if($value['seller_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行账户数据");
-            	if($value['buyer_id']=="") return error_show(1005,"第".($key+1)."行缺少购买方纳税识别号数据");
-            	if($value['buyer_title']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
-            	if($value['buyer_addr']=="") return error_show(1005,"第".($key+1)."行缺少购买方地址数据");
-            	if($value['buyer_mobile']=="") return error_show(1005,"第".($key+1)."行缺少购买方联系方式数据");
-            	if($value['buyer_bank']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行数据");
-            	if($value['buyer_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行账户数据");
-            	if($value['tax_fee']=="") return error_show(1005,"第".($key+1)."行缺少发票税额数据");
-            }
+//            if($value['inv_type']==="000"){
+//            	if($value['seller_id']=="") return error_show(1005,"第".($key+1)."行缺少销售方纳税识别号数据");
+//            	if($value['seller_title']=="") return error_show(1005,"第".($key+1)."行缺少销售方名称数据");
+//            	if($value['seller_addr']=="") return error_show(1005,"第".($key+1)."行缺少销售方地址数据");
+//            	if($value['seller_mobile']=="") return error_show(1005,"第".($key+1)."行缺少销售方联系方式数据");
+//            	if($value['seller_bank']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行数据");
+//            	if($value['seller_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少销售方银行账户数据");
+//            	if($value['buyer_id']=="") return error_show(1005,"第".($key+1)."行缺少购买方纳税识别号数据");
+//            	if($value['buyer_title']=="") return error_show(1005,"第".($key+1)."行缺少购买方名称数据");
+//            	if($value['buyer_addr']=="") return error_show(1005,"第".($key+1)."行缺少购买方地址数据");
+//            	if($value['buyer_mobile']=="") return error_show(1005,"第".($key+1)."行缺少购买方联系方式数据");
+//            	if($value['buyer_bank']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行数据");
+//            	if($value['buyer_bankNo']=="") return error_show(1005,"第".($key+1)."行缺少购买方银行账户数据");
+//            	if($value['tax_fee']=="") return error_show(1005,"第".($key+1)."行缺少发票税额数据");
+//            }
 			!isset($total[$value['invNo']]) ? $total[$value['invNo']]['total']=0:"";
 
             $temp=[];

+ 3 - 3
app/admin/controller/Supplier.php

@@ -41,9 +41,9 @@ class Supplier extends BaseController
         ->leftJoin("company_info b","a.code=b.companyNo and b.is_del=0")
         ->where($condition)
         ->page($page,$size)->order("a.id desc")
-        ->field("a.*,b.company_name,
-        company_address,company_license,bankNo,bank_name,b.contector as company_contector,b.mobile as company_mobile,
-        company_img")->select();
+        ->field("a.*,b.company_name,company_address,company_license,bankNo,bank_name,
+        b.contector as company_contector,b.mobile as company_mobile,company_img")
+        ->select();
         return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }