Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Resign.php

@@ -109,14 +109,14 @@ class Resign extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
-        if($customer==""){
-            return error_show(1004,"参数customer_code不能为空");
-        }
-        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
-        if($supplier==""){
-            return error_show(1004,"参数supplier_code不能为空");
-        }
+//        $customer = isset($this->post['customer_code'])&&$this->post['customer_code']!="" ?trim($this->post['customer_code']):"";
+//        if($customer==""){
+//            return error_show(1004,"参数customer_code不能为空");
+//        }
+//        $supplier = isset($this->post['supplier_code'])&&$this->post['supplier_code']!="" ?trim($this->post['supplier_code']):"";
+//        if($supplier==""){
+//            return error_show(1004,"参数supplier_code不能为空");
+//        }
         $good_code = isset($this->post['good_code']) && $this->post['good_code']!=""?trim($this->post['good_code']):"";
         if($good_code==""){
             return error_show(1004,"参数good_code不能为空");
@@ -133,7 +133,7 @@ class Resign extends BaseController
         if($mark==""){
             return error_show(1004,"参数remark不能为空");
         }
-        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+        $good =Db::name("good")->alias("a")->leftJoin("good_platform b","a.spuCode=b.spuCode")->where([["b.spuCode","=",
             $good_code],["a.is_del","=",0]])->find();
         if($good==false){
             return error_show(1004,"未找到商品数据");
@@ -154,8 +154,8 @@ class Resign extends BaseController
             "good_num"=>$good_num,
             "skuCode"=>$good['skuCode'],
             "wsm_code"=>'',
-            "companyNo"=>$customer,
-            "supplierNo"=>$supplier,
+            "companyNo"=>$good['companyNo'],
+            "supplierNo"=>$good['supplierNo'],
             "file_url"=>$file_url,
             "lasttime"=>$lastime,
             "status"=>1,
@@ -232,14 +232,14 @@ class Resign extends BaseController
         if(empty($info)){
             return error_show(1002,'未找到数据');
         }
-        $good =Db::name("good_platform")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+        $good =Db::name("good_platform")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where([["a.skuCode","=",
             $info['skuCode']],["a.is_del","=",0]])->find();
         if($good==false){
             return error_show(1004,"未找到商品数据");
         }
         $int= isset($good['cat_id']) && $good['cat_id'] !=0 ? made($good['cat_id']):[];
         $metal = \think\facade\Config::get("noble");
-        $info['noble_metal']= isset($good['noble_metal']) && $good['noble_metal'] !='' ?$metal[$good['noble_metal']]:'';
+        $info['noble_metal']= isset($metal[$good['noble_metal']]) && $good['noble_metal'] !=''?$metal[$good['noble_metal']]:'';
         $info['noble_id']= isset($good['noble_metal']) && $good['noble_metal'] !='' ? $good['noble_metal']:"";
         $info['wsm_name']="";
         $info['file_name'] ='';
@@ -257,7 +257,7 @@ class Resign extends BaseController
         }
         $supplier =Db::name("supplier")->where(["code"=>$info['supplierNo']])->find();
         $info['supplier_name'] = isset($supplier['name'])?$supplier['name']:"";
-        $company =Db::name("bussiness")->where(["companyNo"=>$info['companyNo']])->find();
+        $company =Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
         $info['company_name'] = isset($company['company'])?$company['company']:"";
         $info['can']=$int;
         return app_show(0,"获取成功",$info);
@@ -299,7 +299,7 @@ class Resign extends BaseController
         if($mark==""){
             return error_show(1004,"参数remark不能为空");
         }
-        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where([["a.skuCode","=",
             $good_code],["a.is_del","=",0]])->find();
         if($good==false){
             return error_show(1004,"未找到商品数据");
@@ -719,7 +719,7 @@ class Resign extends BaseController
         if($info['wsm_code']==""){
             return error_show(1002,'备库仓库不能为空');
         }
-        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCod=b.spuCode")->where([["a.skuCode","=",
+        $good =Db::name("good")->alias("a")->leftJoin("good b","a.spuCode=b.spuCode")->where([["a.skuCode","=",
             $info['skuCode']],["a.is_del","=",0]])->find();
         if($good==false){
             return error_show(1004,"未找到商品数据");

app/admin/controller/Sale.php

@@ -51,10 +51,10 @@ class Sale extends BaseController
         if($platform_id==''){
             return error_show(1004,"参数platform_id不能为空");
         }
-        $zxinfoNo= isset($this->post['zxinfoNo'])&& $this->post['zxinfoNo'] !=="" ? trim($this->post['zxinfoNo']) :"";
-        if($zxinfoNo=="" &&$order_type!==1){
-            return error_show(1002,"参数 zxinfoNo 不能为空");
-        }
+//        $zxinfoNo= isset($this->post['zxinfoNo'])&& $this->post['zxinfoNo'] !=="" ? trim($this->post['zxinfoNo']) :"";
+//        if($zxinfoNo=="" &&$order_type!==1){
+//            return error_show(1002,"参数 zxinfoNo 不能为空");
+//        }
         $platform_order =isset($this->post['platform_order']) && $this->post['platform_order'] !=="" ?trim($this->post['platform_order']):"";
         if($platform_order==''){
             return error_show(1004,"参数platform_order不能为空");
@@ -145,7 +145,7 @@ class Sale extends BaseController
                 "send_type"=>$sendtype,
                 "supplierNo"=>$supplierNo,
                 "is_del"=>0,
-                "zxNo"=>$zxinfoNo,
+                "zxNo"=>"",
                 "platform_order"=>$platform_order,
                 "platform_id"=>$platform_id,
                 "remark"=>$remark,

app/admin/controller/User.php

@@ -305,10 +305,73 @@ class User extends BaseController
                return error_show(1002,"未找到部门信息");
            }
         }
+        $companyArr = isset($this->post['companyArr'])&&!empty($this->post['companyArr']) ?
+            $this->post['companyArr']:"";
+        if($companyArr==""){
+            return error_show(1004,"参数companyArr不能为空");
+        }
+        $compArr=[];
+        foreach ($companyArr as $value){
+            $tmp=[];
+            if(!isset($value['id'])||$value['id']==''){
+                return error_show(1004,"参数业务公司id不能为空");
+            }
+            $tmp['userid']=$userid;
+            $tmp['businessid']=$userid;
+            $tmp['is_main']=isset($value['is_main'])?$value['is_main']:0;
+            $tmp['is_del']=0;
+            $tmp['addtime']=date("Y-m-d H:i:s");
+            $tmp['updatetime']=date("Y-m-d H:i:s");
+            $compArr[]=$tmp;
+        }
+        $platform = isset($this->post['platform'])&&!empty($this->post['platform']) ?
+            $this->post['platform']:"";
+        if($platform==""){
+            return error_show(1004,"参数platform不能为空");
+        }
+        $plta =Db::name("platform")->where(["id"=>$platform,"is_del"=>0])->select()->toArray();
+        if(empty($plta)){
+            return error_show(1004,"未找到可用平台");
+        }
+        $userplat =Db::name("user_platform")->where(["uid"=>$userid,"is_del"=>0])->find();
+
+        $isall = isset($this->post['is_all'])&&$this->post['is_all']!==""?intval($this->post['is_all']):"0";
 
         Db::startTrans();
         try{
-
+            $sc=Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->select()->toArray();
+            if(!empty($sc)){
+                $del= Db::name("user_business")->where(["uid"=>$userid,"is_del"=>0])->save(["is_del"=>1,
+                    "updatetime"=>date("Y-m-d H:i:s")]);
+                if($del==false){
+                    Db::rollback();
+                    return error_show(1005,'业务公司添加失败');
+                }
+            }
+            $in = Db::name("user_business")->insertAll($compArr);
+            if($in==0){
+                Db::rollback();
+                return error_show(1005,'业务公司添加失败');
+            }
+            if($userplat==false){
+                $userplat=[
+                    "uid"=>$userid,
+                    "platform"=>implode(",",$platform),
+                    "is_all"=>$isall,
+                    "is_del"=>0,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+            }else{
+             $userplat['platform']= implode(",",$platform);
+             $userplat['is_all']= $isall;
+             $userplat['updatetime']= date("Y-m-d H:i:s");
+            }
+            $patup =Db::name("user_platform")->save($userplat);
+            if($patup==false){
+                Db::rollback();
+                return error_show(1005,'业务平台添加失败');
+            }
             $userrole = Db::name("user_role")->where(["uid"=>$userid,"is_del"=>0])->find();
             if(empty($userrole)){
                 $roledata =[
@@ -325,17 +388,6 @@ class User extends BaseController
                 $up=Db::name("user_role")->save($userrole);
             }
             if($up){
-                $data=[
-                    "id"=>$userid,
-                    "nickname"=>$nickname,
-                    "mobile"=>$mobile,
-                    "email"=>$email
-                ];
-                $save =resetinfo($toke,$data);
-                if(!empty($save) && $save['code']!=0){
-                    Db::rollback();
-                    return error_show($save['code'],$save['message']);
-                }
                  Db::name("depart_user")->where(["uid"=>$userid])->save(['is_del'=>1]);
                 if(isset($item_arr)&&!empty($item_arr)){
                     foreach ($item_arr as $v){
@@ -359,13 +411,23 @@ class User extends BaseController
                        }
                     }
                 }
-                Db::commit();
-                return app_show(0,"更新成功");
             }else{
                 Db::rollback();
                 return error_show(1005,'角色更新失败');
             }
-
+            $data=[
+                "id"=>$userid,
+                "nickname"=>$nickname,
+                "mobile"=>$mobile,
+                "email"=>$email
+            ];
+            $save =resetinfo($toke,$data);
+            if(!empty($save) && $save['code']!=0){
+                Db::rollback();
+                return error_show($save['code'],$save['message']);
+            }
+            Db::commit();
+            return app_show(0,"更新成功");
         }catch(\Exception $e){
             Db::rollback();
             return app_show(1002,$e->getMessage());

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']);
         }
@@ -67,6 +67,14 @@ class WareHouse extends BaseController
             return error_show(1004,'参数mobile 不能为空');
         }
         $position = isset($post['position'])&& $post['position']!='' ?trim($post['position']) :'';
+        $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,"业务企业未找到");
+        }
         $wsm_type = isset($post['wsm_type']) && $post['wsm_type']!=="" ? intval($post['wsm_type']):"1";
         $wsm_name = isset($post['wsm_name']) && $post['wsm_name']!=="" ? trim($post['wsm_name']):"";
         $wsm_mobile = isset($post['wsm_mobile']) && $post['wsm_mobile']!=="" ? trim($post['wsm_mobile']):"";
@@ -82,7 +90,8 @@ 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,
                 'position'=>$position,
@@ -111,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();
@@ -147,7 +156,7 @@ class WareHouse extends BaseController
         if($mobile!=""){
             $condition[]=["a.mobile","like","%{$mobile}%"];
         }
-        $contactor = isset($post['contactor'])&&$post['contactor']!="" ? trim($post['contactor']) :"";
+        $contactor = isset($post['contactor_id'])&&$post['contactor_id']!="" ? trim($post['contactor_id']) :"";
         if($contactor!=""){
             $condition[]=["a.contactor","=",$contactor];
         }
@@ -161,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']!=""){
@@ -171,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'] :"";
@@ -193,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,"未找到数据");
         }
@@ -204,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']!=""){
@@ -237,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){
@@ -358,11 +388,15 @@ class WareHouse extends BaseController
         if($supplier!=""){
             $condition[]=["supplierNo","=",$supplier];
         }
+        $company = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($company!=""){
+            $condition[]=["companyNo","=",$company];
+        }
         $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? intval($post['wsm_type']) :"1";
          $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){
@@ -382,6 +416,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;