ad

app/admin/controller/WareHouse.php

@@ -53,11 +53,11 @@ class WareHouse extends BaseController
         if($addr==''){
             return error_show(1004,'参数addr 不能为空');
         }
-        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
-        if($contactor==''){
-            return error_show(1004,'参数contactor 不能为空');
+        $contactor_id = isset($post['contactor_id'])&& $post['contactor_id']!='' ?trim($post['contactor_id']) :'';
+        if($contactor_id==''){
+            return error_show(1004,'参数 contactor_id 不能为空');
         }
-        $contactorinfo = GetInfoById($post['token'],['id'=>$contactor]);
+        $contactorinfo = GetInfoById($post['token'],['id'=>$contactor_id]);
         if(!empty($contactorinfo) && $contactorinfo['code']!=0){
             return error_show($contactorinfo['code'],$contactorinfo['message']);
         }
@@ -90,7 +90,7 @@ class WareHouse extends BaseController
                 'wsm_type'=>$wsmtype,
                 'supplierNo'=>$supplier,
                 'addr'=>$addr,
-                'contactor'=>$contactor,
+                'contactor'=>$contactor_id,
                 'companyNo'=>$companyNo,
                 'contactor_name'=>isset($nickname) ?$nickname:"" ,
                 'mobile'=>$mobile,
@@ -120,7 +120,7 @@ class WareHouse extends BaseController
                     $sf = ["order_code"=>$wsm_code,"status"=>1,"action_remark"=>'',"action_type"=>"create"];
                     ActionLog::logAdd($post['token'],$sf,"warehouse",1,$addrinfo);
                     Db::commit();
-                    return app_show(0,'仓库创建成功');
+                    return app_show(0,'仓库创建成功',["wsm_code"=>$wsm_code]);
                 }
             }
             Db::rollback();
@@ -170,8 +170,9 @@ class WareHouse extends BaseController
             ->where($condition)->count();
         $page>=ceil($count/$size) ? $page = ceil($count/$size): '';
         $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
-            ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,
-            a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->page($page,$size)->order("a.addtime desc")
+            ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,
+            a.status,a.addtime,a.companyNo,a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->page($page,$size)
+            ->order("a.addtime desc")
             ->select();
         foreach ($list as $key=>$value){
             if($value['supplierNo']!=""){
@@ -180,6 +181,12 @@ class WareHouse extends BaseController
             }else{
                 $value['supplier_name']="";
             }
+            if($value['companyNo']!=""){
+                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+                $value['company_name'] = isset($company['company']) ? $company['company'] :"";
+            }else{
+                $value['company_name']="";
+            }
             if($value['wsm_type']!=""){
                 $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
                 $value['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -202,8 +209,8 @@ class WareHouse extends BaseController
         };
         $warse = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
             ->where(["a.id"=>$id,"a.is_del"=>0,"a.status"=>1])->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a
-        .contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,
-            a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->find();
+        .contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,a.companyNo,
+            a.updatetime,a.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->find();
         if(empty($warse)){
             return error_show(1004,"未找到数据");
         }
@@ -213,6 +220,12 @@ class WareHouse extends BaseController
         }else{
             $warse['supplier_name']="";
         }
+        if($warse['companyNo']!=""){
+            $company = Db::name("business")->where(["companyNo"=>$warse['companyNo']])->find();
+            $warse['company_name'] = isset($company['company']) ? $company['company'] :"";
+        }else{
+            $warse['company_name']="";
+        }
         $warse['addrs_code'] = isset($warse['addrs_code'])&&$warse['addrs_code']!="" ? json_decode($warse['addrs_code'],true):"";
         $warse['addr_code'] = isset($warse['addr_code'])&&$warse['addr_code']!="" ? json_decode($warse['addr_code'],true):"";
         if($warse['wsm_type']!=""){
@@ -246,13 +259,21 @@ class WareHouse extends BaseController
         if($addr==''){
             return error_show(1004,'参数addr 不能为空');
         }
-        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
+//        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
+//        if($contactor==''){
+//            return error_show(1004,'参数contactor_id 不能为空');
+//        }
+        $contactor = isset($post['contactor_id'])&& $post['contactor_id']!='' ?intval($post['contactor_id']) :'';
         if($contactor==''){
             return error_show(1004,'参数contactor 不能为空');
         }
-        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
-        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,"业务企业未找到");
         }
         $contactorinfo = GetInfoById($post['token'],['id'=>$contactor]);
         if(!empty($contactorinfo) && $contactorinfo['code']!=0){
@@ -371,7 +392,7 @@ class WareHouse extends BaseController
          $condition[]=["a.wsm_type","=",$wsm_type];
         $list = Db::name("warehouse_info")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")
             ->where($condition)->field("a.id,a.wsm_code,a.name,a.wsm_type,a.supplierNo,a.addr,a.contactor,a.contactor_name,a.mobile,a.position,a.status,a.addtime,
-            a.updatetime,b.wsm_type,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->order("a.addtime desc")
+            a.updatetime,a.wsm_type,a.companyNo,b.wsm_name,b.wsm_mobile,b.wsm_addr,b.addr_code,a.addrs_code")->order("a.addtime desc")
             ->select();
         $data=[];
         foreach ($list as $value){
@@ -391,6 +412,13 @@ class WareHouse extends BaseController
             $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'] :"";
+            $temp['companyNo'] = $value['companyNo'];
+            if($value['companyNo']!=""){
+                $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+                $temp['company_name'] = isset($company['company']) ? $company['company'] :"";
+            }else{
+                $temp['company_name']="";
+            }
             $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
             $temp['type_name'] = isset($type['name']) ? $type['name'] :"";
             $data[]=$temp;