仓库相关，去除supplierNo字段

app/admin/controller/WareHouse.php

@@ -30,23 +30,24 @@ class WareHouse extends BaseController
         if($name==''){
             return error_show(1004,'参数name 不能为空');
         }
-        $supplier = isset($post['supplierNo'])&& $post['supplierNo']!='' ?trim($post['supplierNo']) :'';
-        if($supplier==''){
-            return error_show(1004,'参数supplierNo 不能为空');
-        }
-        $supplierinfo = Db::name("supplier")->where(["code"=>$supplier])->find();
-        if(empty($supplierinfo)){
-            return error_show(1004,'未找到供应商数据');
-        }
-        if($name==$supplierinfo['name']){
-            return error_show(1004,'仓库名不可以与供应商名称相同');
-        }
+//        $supplier = isset($post['supplierNo'])&& $post['supplierNo']!='' ?trim($post['supplierNo']) :'';
+//        if($supplier==''){
+//            return error_show(1004,'参数supplierNo 不能为空');
+//        }
+//        $supplierinfo = Db::name("supplier")->where(["code"=>$supplier])->find();
+//        if(empty($supplierinfo)){
+//            return error_show(1004,'未找到供应商数据');
+//        }
+//        if($name==$supplierinfo['name']){
+//            return error_show(1004,'仓库名不可以与供应商名称相同');
+//        }
         $wsmtype = isset($post['wsmtype'])&& $post['wsmtype']!='' ?intval($post['wsmtype']) :'';
         if($wsmtype==''){
             return error_show(1004,'参数wsmtype 不能为空');
         }
-        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],["wsm_type","=",1],
-            ['supplierNo',"=",$supplier]])->find();
+        $isT = Db::name('warehouse_info')
+            ->where([['name',"=",$name],["is_del","=",0],["wsm_type","=",1]])
+            ->find();
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }
@@ -90,7 +91,7 @@ class WareHouse extends BaseController
                 'wsm_code'=>$wsm_code,
                 'name'=>$name,
                 'wsm_type'=>$wsmtype,
-                'supplierNo'=>$supplier,
+                'supplierNo'=>'',
                 'addr'=>$addr,
                 'contactor'=>$contactor_id,
                 'companyNo'=>$companyNo,
@@ -138,10 +139,10 @@ class WareHouse extends BaseController
 
         $condition= [['a.is_del',"=",0],["b.is_del","=",0]];
 
-        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
-        if($supplier!=""){
-            $condition[]=["supplierNo","=",$supplier];
-        }
+//        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
+//        if($supplier!=""){
+//            $condition[]=["supplierNo","=",$supplier];
+//        }
         $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
         if($companyNo!=""){
             $condition[]=["companyNo","=",$companyNo];
@@ -209,12 +210,12 @@ class WareHouse extends BaseController
             ->select()
             ->toArray();
         foreach ($list as $key=>$value){
-            if($value['supplierNo']!=""){
-                $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-                $value['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
-            }else{
-                $value['supplier_name']="";
-            }
+//            if($value['supplierNo']!=""){
+//                $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+//                $value['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
+//            }else{
+//                $value['supplier_name']="";
+//            }
             if($value['companyNo']!=""){
                 $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
                 $value['company_name'] = isset($company['company']) ? $company['company'] :"";
@@ -252,12 +253,12 @@ class WareHouse extends BaseController
         if(empty($warse)){
             return error_show(1004,"未找到数据");
         }
-        if($warse['supplierNo']!=""){
-            $supplierinfo = Db::name("supplier")->where(["code"=>$warse['supplierNo']])->find();
-            $warse['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
-        }else{
-            $warse['supplier_name']="";
-        }
+//        if($warse['supplierNo']!=""){
+//            $supplierinfo = Db::name("supplier")->where(["code"=>$warse['supplierNo']])->find();
+//            $warse['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
+//        }else{
+//            $warse['supplier_name']="";
+//        }
         if($warse['companyNo']!=""){
             $company = Db::name("business")->where(["companyNo"=>$warse['companyNo']])->find();
             $warse['company_name'] = isset($company['company']) ? $company['company'] :"";
@@ -422,10 +423,10 @@ class WareHouse extends BaseController
 
         $condition= [['a.is_del',"=",0],['a.status',"=",1],["b.is_del","=",0]];
 
-        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
-        if($supplier!=""){
-            $condition[]=["supplierNo","=",$supplier];
-        }
+//        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
+//        if($supplier!=""){
+//            $condition[]=["supplierNo","=",$supplier];
+//        }
         $company = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
         if($company!=""){
             $condition[]=["companyNo","=",$company];
@@ -452,8 +453,8 @@ class WareHouse extends BaseController
             $temp['addrs_cn'] =GetAddr($value['addrs_code']);
             $temp['addr'] =$value['addr'];
             $temp['wsm_addr_cn'] =GetAddr($value['addr_code']);
-            $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
-            $temp['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
+//            $supplierinfo = Db::name("supplier")->where(["code"=>$value['supplierNo']])->find();
+//            $temp['supplier_name'] = isset($supplierinfo['name']) ? $supplierinfo['name'] :"";
             $temp['companyNo'] = $value['companyNo'];
             if($value['companyNo']!=""){
                 $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();