warse

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/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']);
-//
 //        }
     }
 
@@ -59,60 +57,83 @@ 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]);
     }
 
@@ -126,6 +147,18 @@ 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['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);
     }
 

app/admin/route/app.php

@@ -77,6 +77,11 @@ 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/del");
+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");
+