Merge branch 'dev' into plm

app/admin/controller/Addr.php

@@ -0,0 +1,41 @@
+<?php
+
+
+namespace app\admin\controller;
+use app\BaseController;
+use think\facade\Db;
+
+
+class Addr extends BaseController
+{
+    public function province(){
+        $list=Db::name("province")->select();
+        return app_show(0,"获取成功",$list);
+    }
+    public function area(){
+        $post=$this->request->post();
+        $city_code = isset($post['code'])&& $post['code']!="" ? $post['code']:"";
+        if($city_code==""){
+            return error_show(1002,"市级未选择");
+        }
+        $city =Db::name("city")->where(['city_code'=>$city_code])->find();
+        if(empty($city)){
+            return error_show(1003,"参数code非法数据");
+        }
+        $list=Db::name("area")->where(['city_code'=>$city_code])->select();
+        return app_show(0,"获取成功",$list);
+    }
+    public function city(){
+        $post=$this->request->post();
+        $province_code = isset($post['code'])&& $post['code']!="" ? $post['code']:"";
+        if($province_code==""){
+            return error_show(1002,"省级未选择");
+        }
+        $provice = Db::name("province")->where(['province_code'=>$province_code])->find();
+        if(empty($provice)){
+            return error_show(1003,"参数code非法数据");
+        }
+        $list=Db::name("city")->where(['province_code'=>$province_code])->select();
+        return app_show(0,"获取成功",$list);
+    }
+}

app/admin/controller/Newfill.php

@@ -4,7 +4,6 @@ namespace app\admin\controller;
 
 use app\BaseController;
 use think\App;
-use think\db\Where;
 use think\facade\Db;
 
 class Newfill extends BaseController

app/admin/controller/Role.php

@@ -13,16 +13,16 @@ class Role extends BaseController
     {
         parent::__construct($app);
         $post  =$this->request->post();
-//        $token = isset($post['token']) ? trim($post['token']) : "";
-//        if($token==""){
-//            return error_show(101,'token不能为空');
-//
-//        }
-//        $effetc = VerifyTokens($token);
-//        if(!empty($effetc) && $effetc['code']!=0){
-//            return error_show($effetc['code'],$effetc['message']);
-//
-//        }
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+
+        }
     }
 
     /**
@@ -85,10 +85,10 @@ class Role extends BaseController
 //        if($role_code==""){
 //            return error_show(1002,"参数role_code 不能为空");
 //        }
-        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
-        if($isCode){
-            return error_show(1002,"角色编号已存在");
-        }
+//        $isCode=Db::name("role")->where(['role_code'=>$role_code])->find();
+//        if($isCode){
+//            return error_show(1002,"角色编号已存在");
+//        }
 //        $item = isset($post['item']) ? trim($post['item']) : "";
 //        if($item==""){
 //            return error_show(1003,"参数item 不能为空");

app/admin/controller/User.php

@@ -37,6 +37,12 @@ class User extends BaseController
                 ->field("roleid,role_name")->find();
             $value['roleid'] = isset($role['roleid']) ? $role['roleid'] :"";
             $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
+            $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
+            $value['depart']="";
+            if(!empty($depart)){
+                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
+                $value['depart'] = implode(",",$deparname);
+            }
             $list[]=$value;
         }
         $data['data']['list'] = $list;
@@ -88,7 +94,7 @@ class User extends BaseController
         if($token==""){
             return error_show(101,'token不能为空');
         }
-        $effetc = verfiyToken($token);
+        $effetc =  VerifyTokens($token);
         if(!empty($effetc) && $effetc['code']!=0){
             return error_show($effetc['code'],$effetc['message']);
         }
@@ -118,17 +124,23 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
-        $userinfo=GetAccountall($token);
-
+        $userinfo=GetAccountall($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show(1002,"员工信息不存在");
         }
         $data = $userinfo['data'];
-        $role = Db::name("role")->column("role_name","id");
-        $role[0]="";
         $list=[];
         foreach ($data as $value){
-            $value["role_name"] = isset($role[$value["roleid"]]) ? $role[$value["roleid"]]:"";
+            $role = Db::name("user_role")->alias('a')->leftJoin('role b',"a.roleid = b.id")->where("a.uid","=",$value['id'])
+                ->field("roleid,role_name")->find();
+            $value['roleid'] = isset($role['roleid']) ? $role['roleid'] :"";
+            $value['role_name'] = isset($role['role_name']) ? $role['role_name'] :"";
+            $depart = Db::name("depart_user")->where([["uid","=",$value['id']],["is_del","=",0]])->column("itemid");
+            $value['depart']="";
+            if(!empty($depart)){
+                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name")->select();
+                $value['depart'] = $deparname;
+            }
             $list[]=$value;
         }
         return app_show(0,"获取成功",$list);
@@ -151,6 +163,11 @@ class User extends BaseController
         if(!empty($effetc) && $effetc['code']!=0){
             return app_show($effetc['code'],$effetc['message']);
         }
+        $itemid = isset($post['itemid']) && $post['itemid']!=="" ? intval($post['itemid']) :"";
+        if($itemid!==""){
+            $uid = Db::name("depart_user")->where([["itemid","=",$itemid],["is_del","=",0]])->column("uid");
+            $post['uid'] =$uid;
+        }
         $userinfo=GetList($token,$post);
         if(empty($userinfo)||$userinfo['code']!=0){
             return app_show($userinfo['code'],$userinfo['msg']);
@@ -165,8 +182,8 @@ class User extends BaseController
             $depart = Db::name("depart_user")->where([["uid","=",$data['uid']],["is_del","=",0]])->column("itemid");
             $value['depart']="";
             if(!empty($depart)){
-                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->column("name");
-                $value['depart'] = implode(",",$deparname);
+                $deparname = Db::name("company_item")->where(["id"=>$depart,"is_del"=>0])->field("id,name")->select();
+                $value['depart'] = $deparname;
             }
             $list[]=$value;
         }
@@ -221,7 +238,7 @@ class User extends BaseController
         if ($toke==""){
             return app_show(100,"token不能为空");
         }
-        $verify = VerifyToken($toke);
+        $verify = VerifyTokens($toke);
         if ($verify['code']!=0){
             return app_show($verify['code'],$verify['message']);
         }
@@ -243,11 +260,114 @@ class User extends BaseController
         }
         $email= isset($post['email'])? trim($post['email']):"";
         $role =isset($post['role'])? intval($post['role']):0;
-        $data=[
-            "id"=>$userid,
-            "nickname"=>$nickname,
-            "mobile"=>$mobile,
-            "email"=>$email
-        ];
+        if($role!=0){
+            $roleinfo =Db::name("role")->where("id","=",$role)->find();
+            if(empty($roleinfo)){
+                return error_show(1002,"角色不存在");
+            }
+            if($roleinfo['status']==0){
+                return error_show(1002,"角色已禁用");
+            }
+        }
+        Db::startTrans();
+        try{
+
+            $userrole = Db::name("user_role")->where(["uid"=>$userid,"is_del"=>0])->find();
+            if(empty($userrole)){
+                $roledata =[
+                    "uid"=>$userid,
+                    "roleid"=>$role,
+                    "status"=>1,
+                    "addtime"=>date("Y-m-d H:i:s"),
+                    "updatetime"=>date("Y-m-d H:i:s")
+                ];
+               $up= Db::name("user_role")->insert($roledata);
+            }else{
+                $userrole['roleid'] = $role;
+                $userrole['updatetime'] = date("Y-m-d H:i:s");
+                $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::commit();
+                return app_show(0,"更新成功");
+            }else{
+                Db::rollback();
+                return error_show(1005,'角色更新失败');
+            }
+
+        }catch(\Exception $e){
+            Db::rollback();
+            return app_show(1002,$e->getMessage());
+        }
+    }
+
+    public  function setPwd(){
+        $post  =$this->request->post();
+        $token = isset($post['token']) ? trim($post['token']) : "";
+        if($token==""){
+            return error_show(101,'token不能为空');
+        }
+        $effetc =  VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
+        $userid = isset($post['id'])&&$post['id']!==""?intval($post['id']):"";
+        if($userid==""){
+            return error_show(1004,"参数id 不能为空");
+        }
+        $newPwd= isset($post['password']) ? trim($post['password']) : "";
+        if($newPwd==""){
+            return error_show(1001,'密码不能为空');
+        }
+
+        $data = resetpwd($token,["id"=>$userid,'password'=>$newPwd]);
+        if(empty($data)||$data['code']!=0){
+            return error_show($data['code'],$data['message']);
+        }else{
+            return app_show(0,"密码修改成功");
+        }
+    }
+    public function UserStatus()
+    {
+        $post=$this->request->post();
+        $toke= isset($post['token'])? trim($post['token']):"";
+        if ($toke==""){
+            return app_show(100,"token不能为空");
+        }
+        $verify = VerifyTokens($toke);
+        if ($verify['code']!=0){
+            return app_show($verify['code'],$verify['message']);
+        }
+        $userid = isset($post['id'])&&$post['id']!==""?intval($post['id']):"";
+        if($userid==""){
+            return error_show(1004,"参数userid 不能为空");
+        }
+        $status = isset($post['status'])&&$post['status']!=""?intval($post['status']):"";
+
+        if($status===""){
+            return error_show(1004,"参数status 不能为空");
+        }
+        if(!in_array($status,[0,1])){
+            return error_show(1004,"参数status无效");
+        }
+        $message = $status==1?"启用":"禁用";
+        $set = resetstatus($toke,["id"=>$userid,"status"=>$status]);
+        if(empty($set)||$set['code']!=0){
+            return error_show(1005,"{$message}失败");
+        }else{
+            return app_show(0,"{$message}成功");
+        }
     }
+
 }

app/admin/controller/WareHouse.php

@@ -1,7 +1,6 @@
 <?php
-
-
 namespace app\admin\controller;
+
 use app\BaseController;
 use think\App;
 use think\facade\Db;
@@ -20,7 +19,6 @@ class WareHouse extends BaseController
 //        $effetc = VerifyTokens($token);
 //        if(!empty($effetc) && $effetc['code']!=0){
 //            return error_show($effetc['code'],$effetc['message']);
-//
 //        }
     }
 
@@ -42,7 +40,7 @@ class WareHouse extends BaseController
         if($wsmtype==''){
             return error_show(1004,'参数wsmtype 不能为空');
         }
-        $isT = Db::name('warehouse_info')->where([['name',"=",$name]])->find();
+        $isT = Db::name('warehouse_info')->where([['name',"=",$name],["is_del","=",0]])->find();
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }
@@ -59,65 +57,188 @@ class WareHouse extends BaseController
             return error_show(1004,'参数mobile 不能为空');
         }
         $position = isset($post['position'])&& $post['position']!='' ?trim($post['position']) :'';
-        $data =[
-            'wsm_code'=>makeNo("WSM"),
-            'name'=>$name,
-            'wsm_type'=>$wsmtype,
-            'supplierNo'=>$supplier,
-            'addr'=>$addr,
-            'contactor'=>$contactor,
-            'mobile'=>$mobile,
-            'position'=>$position,
-            'status'=>1,
-            'addtime'=>date("Y-m-d H:i:s"),
-            'updatetime'=>date("Y-m-d H:i:s")
-        ];
-        $add = Db::name('warehouse_info')->insert($data);
+        $wsm_type = isset($post['wsm_type']) && $post['wsm_type']!=="" ? intval($post['wsm_type']):"";
+        $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']):"";
+        $addr_code = isset($post['addr_code']) && $post['addr_code']!=="" ? trim($post['addr_code']):"";
+        try{
+            $data =[
+                'wsm_code'=>makeNo("WSM"),
+                'name'=>$name,
+                'wsm_type'=>$wsmtype,
+                'supplierNo'=>$supplier,
+                'addr'=>$addr,
+                'contactor'=>$contactor,
+                'mobile'=>$mobile,
+                'position'=>$position,
+                'status'=>1,
+                'addtime'=>date("Y-m-d H:i:s"),
+                'updatetime'=>date("Y-m-d H:i:s")
+            ];
+            $add = Db::name('warehouse_info')->insert($data);
+            if($add){}
+        }catch (\Exception $e){
+            return error_show(1005,$e->getMessage());
+        }
+
         return $add ? app_show(0,'仓库创建成功'): error_show(1005,'仓库创建失败');
     }
 
     public function list(){
         $post  =$this->request->post();
 
-        $condition = [['is_del'=>0]];
-        $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
-        if($supplier!=""){
-            $condition[]=["supplierNo"=>$supplier];
-        }
+        $condition= [['is_del',"=",0]];
+
         $supplier = isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         if($supplier!=""){
-            $condition[]=["supplierNo"=>$supplier];
+            $condition[]=["supplierNo","=",$supplier];
         }
         $wsm_code = isset($post['wsm_code'])&&$post['wsm_code']!="" ? trim($post['wsm_code']) :"";
         if($wsm_code!=""){
-            $condition[]=["wsm_code"=>$wsm_code];
+            $condition[]=["wsm_code","=",$wsm_code];
         }
         $start = isset($post['start'])&&$post['start']!="" ? $post['start'] :"";
         if($start!=""){
-            $condition[]=["addtime"=>[">=",$start]];
+            $condition[]=["addtime",">=",$start];
         }
         $end = isset($post['end'])&&$post['end']!="" ? $post['end'] :"";
-        if($start!=""){
-            $condition[]=["addtime"=>[">=",$end]];
+        if($end!=""){
+            $condition[]=["addtime","<=",$end];
         }
         $mobile = isset($post['mobile'])&&$post['mobile']!="" ?  trim($post['mobile']) :"";
         if($mobile!=""){
-            $condition[]=["mobile"=>["like","%{$mobile}%"]];
+            $condition[]=["mobile","like","%{$mobile}%"];
         }
         $contactor = isset($post['contactor'])&&$post['contactor']!="" ? trim($post['contactor']) :"";
         if($contactor!=""){
-            $condition[]=["contactor"=>["like","%{$contactor}%"]];
+            $condition[]=["contactor","like","%{$contactor}%"];
         }
         $page = isset($post['page']) &&$post['page']!=='' ?intval($post['page']) :1;
         $size = isset($post['size']) &&$post['size']!=='' ?intval($post['size']) :10;
         $count = Db::name("warehouse_info")->where($condition)->count();
         $page>=ceil($count/$size) ? $page = ceil($count/$size): '';
         $list = Db::name("warehouse_info")->where($condition)->page($page,$size)->order("addtime desc")->select();
+        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['wsm_type']!=""){
+                $type = Db::name("warehouse_type")->where(["id"=>$value['wsm_type']])->find();
+                $value['type_name'] = isset($type['name']) ? $type['name'] :"";
+            }else{
+                $value['type_name']="";
+            }
+            $list[$key]=$value;
+
+        }
         return  app_show(0,"获取成功",['list'=>$list,"count"=>$count]);
     }
 
     public function  info(){
         $post  =$this->request->post();
+        $id = isset($post['id']) && $post['id']!==''?intval($post['id']): "";
+        if($id===""){
+          return  error_show(1004,"参数id不能为空");
+        };
+        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0])->find();
+        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['wsm_type']!=""){
+            $type = Db::name("warehouse_type")->where(["id"=>$warse['wsm_type']])->find();
+            $warse['type_name'] = isset($type['name']) ? $type['name'] :"";
+        }else{
+            $warse['type_name']="";
+        }
+        return app_show(0,"获取成功",$warse);
+    }
 
+    public function  save(){
+        $post  =$this->request->post();
+        $id = isset($post['id']) && $post['id']!==''?intval($post['id']): "";
+        if($id===""){
+            return  error_show(1004,"参数id不能为空");
+        };
+        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0])->find();
+        if(empty($warse)){
+            return error_show(1004,"未找到数据");
+        }
+        $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();
+        if(!empty($isT)){
+            return error_show(1004,'仓库名称已存在');
+        }
+        $addr = isset($post['addr'])&& $post['addr']!='' ?trim($post['addr']) :'';
+        if($addr==''){
+            return error_show(1004,'参数addr 不能为空');
+        }
+        $contactor = isset($post['contactor'])&& $post['contactor']!='' ?trim($post['contactor']) :'';
+        if($contactor==''){
+            return error_show(1004,'参数contactor 不能为空');
+        }
+        $mobile = isset($post['mobile'])&& $post['mobile']!='' ?trim($post['mobile']) :'';
+        if($mobile==''){
+            return error_show(1004,'参数mobile 不能为空');
+        }
+        $position = isset($post['position'])&& $post['position']!='' ?trim($post['position']) :'';
+        $data =[
+            'name'=>$name,
+            'addr'=>$addr,
+            'contactor'=>$contactor,
+            'mobile'=>$mobile,
+            'position'=>$position,
+            'updatetime'=>date("Y-m-d H:i:s")
+        ];
+        $add = Db::name('warehouse_info')->where($warse)->update($data);
+        return $add ? app_show(0,'仓库修改成功'): error_show(1005,'仓库修改失败');
+    }
+
+    public function delete(){
+        $post  =$this->request->post();
+        $id = isset($post['id']) && $post['id']!==''?intval($post['id']): "";
+        if($id===""){
+            return  error_show(1004,"参数id不能为空");
+        };
+        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0])->find();
+        if(empty($warse)){
+            return error_show(1004,"未找到数据");
+        }
+        $warse['is_del'] = 1;
+        $warse['updatetime'] = date("Y-m-d H:i:s");
+        $Del= Db::name("warehouse_info")->save($warse);
+        return $Del? app_show(0,'仓库删除成功'): error_show(1005,'仓库删除失败');
+    }
+
+    public function status(){
+        $post  =$this->request->post();
+        $id = isset($post['id']) && $post['id']!==''?intval($post['id']): "";
+        if($id===""){
+            return  error_show(1004,"参数id不能为空");
+        };
+        $warse = Db::name("warehouse_info")->where(["id"=>$id,"is_del"=>0])->find();
+        if(empty($warse)){
+            return error_show(1004,"未找到数据");
+        }
+        $status = isset($post['status']) && $post['status']!=="" ? intval($post['status']) : "";
+        if($status===""){
+            return error_show(1005,"参数status 不能为空");
+        }
+        $warse['status'] = $status;
+        $warse['updatetime'] = date("Y-m-d H:i:s");
+        $Del= Db::name("warehouse_info")->save($warse);
+        return $Del? app_show(0,'仓库状态修改成功'): error_show(1005,'仓库状态修改失败');
     }
+
 }

app/admin/route/app.php

@@ -69,15 +69,26 @@ Route::rule('customerdelect','admin/Customer/dell');
 
 Route::rule('userlist', 'admin/User/list');
 Route::rule('userinfo', 'admin/User/userInfo');
-Route::rule('userall', 'admin/User/userList');
-
-Route::rule("userstatus","Api/UserInfo/UserStatus");
-Route::rule("usersave","Api/UserInfo/UserSave");
-Route::rule("passset","Api/UserInfo/PassSet");
-Route::rule("userinfobyid","Api/UserInfo/info");
+Route::rule('userall', 'admin/User/userAll');
+Route::rule("userstatus","admin/User/UserStatus");
+Route::rule("usersave","admin/User/UserSave");
+Route::rule("passset","admin/User/setPwd");
+Route::rule("userinfobyid","admin/User/info");
 
 
 
 Route::rule("loglist","admin/System/index");
 Route::rule("versionlist","admin/System/version");
-Route::rule("lastversion","admin/System/LastVersion");
+Route::rule("lastversion","admin/System/LastVersion");
+
+Route::rule("wareadd","admin/WareHouse/add");
+Route::rule("wareinfo","admin/WareHouse/info");
+Route::rule("waresave","admin/WareHouse/save");
+Route::rule("waredel","admin/WareHouse/delete");
+Route::rule("warelist","admin/WareHouse/list");
+Route::rule("warestatus","admin/WareHouse/status");
+
+Route::rule("province","admin/Addr/province");
+Route::rule("city","admin/Addr/city");
+Route::rule("area","admin/Addr/area");
+

app/common.php

@@ -130,7 +130,7 @@ function GetUserlist($token,$condition){
  * @param $condition
  * @return mixed
  */
-function GetAccountall($token){
+function GetAccountall($token, $condition){
     $host = Config::get("app");
 
     $url = $host["api_host"]."/Api/userall";
@@ -250,6 +250,21 @@ function resetinfo($token,$condition){
     return json_decode($response,true);
 }
 
+/**
+ * @param $token
+ * @param $condition
+ * @return mixed
+ */
+function resetstatus($token,$condition){
+    $host = Config::get("app");
+
+    $url = $host["api_host"]."/Api/userstatus";
+    $condition['token']=$token;
+    $response=curl_request($url,$condition);
+
+    return json_decode($response,true);
+}
+
 /**
  * @param $data
  * @throws \think\db\exception\DataNotFoundException