ad

app/admin/controller/WareHouse.php

@@ -62,7 +62,7 @@ class WareHouse extends Base
 //        }
         $isT = Db::name('warehouse_info')
             ->field('id')
-            ->where([['name', "=", $post['name']], ["is_del", "=", 0], ["wsm_type", "=", 1]])
+            ->where([['name', "=", $post['name']], ["is_del", "=", 0],["companyNo","=",$post['companyNo']]])
             ->findOrEmpty();
         if (!empty($isT)) return error_show(1004, '仓库名称已存在');
 
@@ -246,18 +246,7 @@ class WareHouse extends Base
         $tmp = $userCommon->handle('getCodeAndName',['code'=>$all_companyNo]);
 
         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['companyNo']!=""){
-//                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
-//                $value['company_name'] = isset($company['company']) ? $company['company'] :"";
-                $value['company_name'] = $tmp['data'][$value['companyNo']]??'';
-            }else  $value['company_name']="";
-
+			$value['company_name'] = $tmp['data'][$value['companyNo']]??'';
             if($value['wsm_type']!=""){
                 $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
                 $value['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -329,12 +318,17 @@ class WareHouse extends Base
         $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0,"status"=>1])->find();
         if(empty($warse)){
             return error_show(1004,"未找到数据");
+        }
+         $companyNo = isset($post['companyNo'])&& $post['companyNo']!='' ?trim($post['companyNo']) :'';
+        if($companyNo==""){
+            return error_show(1004,"参数companyNo不能为空");
         }
         $name = isset($post['name'])&& $post['name']!='' ?trim($post['name']) :'';
         if($name==''){
             return error_show(1004,'参数name 不能为空');
         }
-        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],["id","<>",$id]])->find();
+        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0],["companyNo","=", $companyNo],["id","<>",
+        $id]])->find();
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }
@@ -350,10 +344,6 @@ class WareHouse extends Base
         if($contactor==''){
             return error_show(1004,'参数contactor 不能为空');
         }
-        $companyNo = isset($post['companyNo'])&& $post['companyNo']!='' ?trim($post['companyNo']) :'';
-        if($companyNo==""){
-            return error_show(1004,"参数companyNo不能为空");
-        }
 //        $company = Db::name("business")->where(["companyNo"=>$companyNo,"is_del"=>0])->find();
 //        if($company==false){
 //            return error_show(1004,"业务企业未找到");
@@ -370,7 +360,6 @@ class WareHouse extends Base
 //        if(!empty($contactorinfo) && $contactorinfo['code']!=0){
 //            return error_show($contactorinfo['code'],$contactorinfo['message']);
 //        }
-        $nickname = $this->uname;
         $mobile = isset($post['mobile'])&& $post['mobile']!='' ?trim($post['mobile']) :'';
         if($mobile==''){
             return error_show(1004,'参数mobile 不能为空');