add

app/admin/controller/Good.php

@@ -34,6 +34,16 @@ class Good extends \app\BaseController
         if($good_code!=""){
             $condtion['b.type_code'] = $good_code;
         }
+        $goodcode =isset($this->post['good_code']) &&$this->post['good_code'] !=="" ? trim($this->post['good_code'])
+            :"";
+        if($goodcode!=""){
+            $condtion['a.good_code'] = $goodcode;
+        }
+        $good_name =isset($this->post['good_name']) &&$this->post['good_name'] !=="" ? trim($this->post['good_name'])
+            :"";
+        if($good_name!=""){
+            $condtion['a.good_name'] = Db::raw("like '%{$good_name}%'");
+        }
         $supplierNo =isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!=""){
             $supplier = Db::name("supplier")->where(["code"=>$supplierNo])->find();
@@ -51,6 +61,7 @@ class Good extends \app\BaseController
         $count = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
             ->join("good_stock c","c.good_type_code = b.type_code","left")
             ->where($condtion)->where("c.is_del=0 or c.is_del is null")->count();
+      //  echo Db::name("good_type")->getLastSql();
         $page>=ceil($count/$size) ? $page=ceil($count/$size) :"";
         $list = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
             ->join("good_stock c","c.good_type_code = b.type_code","left")->where($condtion)->where("c.is_del=0 or c.is_del is null")

app/admin/controller/WareHouse.php

@@ -12,14 +12,14 @@ class WareHouse 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']);
-//        }
+        if($token==""){
+            return error_show(101,'token不能为空');
+
+        }
+        $effetc = VerifyTokens($token);
+        if(!empty($effetc) && $effetc['code']!=0){
+            return error_show($effetc['code'],$effetc['message']);
+        }
     }
 
     public function add(){
@@ -52,6 +52,11 @@ class WareHouse extends BaseController
         if($contactor==''){
             return error_show(1004,'参数contactor 不能为空');
         }
+        $contactorinfo = GetInfoById($post['token'],['id'=>$contactor]);
+        if(!empty($contactorinfo) && $contactorinfo['code']!=0){
+            return error_show($contactorinfo['code'],$contactorinfo['message']);
+        }
+        $nickname = $contactor['data']['nickname'];
         $mobile = isset($post['mobile'])&& $post['mobile']!='' ?trim($post['mobile']) :'';
         if($mobile==''){
             return error_show(1004,'参数mobile 不能为空');
@@ -62,7 +67,7 @@ class WareHouse extends BaseController
         $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']):"";
         $wsm_addr = isset($post['wsm_addr']) && $post['wsm_addr']!=="" ? trim($post['wsm_addr']):"";
-        $addrs_code = isset($post['addrs_code']) && $post['addrs_code']!=="" ? trim($post['addrs_code']):"";
+        $addrs_code = isset($post['addrs_code']) && $post['addrs_code']!=="" ? $post['addrs_code']:"";
         Db::startTrans();
         try{
             $wsm_code = makeNo("WSM");
@@ -73,9 +78,10 @@ class WareHouse extends BaseController
                 'supplierNo'=>$supplier,
                 'addr'=>$addr,
                 'contactor'=>$contactor,
+                'contactor_name'=>isset($nickname) ?$nickname:"" ,
                 'mobile'=>$mobile,
                 'position'=>$position,
-                "addrs_code"=>$addrs_code,
+                "addrs_code"=>json_encode($addrs_code),
                 'status'=>1,
                 'addtime'=>date("Y-m-d H:i:s"),
                 'updatetime'=>date("Y-m-d H:i:s")
@@ -88,7 +94,7 @@ class WareHouse extends BaseController
                     "wsm_name"=>$wsm_name,
                     "wsm_mobile"=>$wsm_mobile,
                     "wsm_addr"=>$wsm_addr,
-                    "addr_code"=>$addr_code,
+                    "addr_code"=>json_encode($addr_code),
                     "status"=>1,
                     "addtime"=>date("Y-m-d H:i:s"),
                     "updatetime"=>date("Y-m-d H:i:s"),
@@ -134,7 +140,11 @@ class WareHouse extends BaseController
         }
         $contactor = isset($post['contactor'])&&$post['contactor']!="" ? trim($post['contactor']) :"";
         if($contactor!=""){
-            $condition[]=["a.contactor","like","%{$contactor}%"];
+            $condition[]=["a.contactor","=",$contactor];
+        }
+        $contactor_name = isset($post['contactor_name'])&&$post['contactor_name']!="" ? trim($post['contactor_name']) :"";
+        if($contactor_name!=""){
+            $condition[]=["a.contactor_name","like","%{$contactor_name}%"];
         }
         $page = isset($post['page']) &&$post['page']!=='' ?intval($post['page']) :1;
         $size = isset($post['size']) &&$post['size']!=='' ?intval($post['size']) :10;
@@ -182,6 +192,8 @@ class WareHouse extends BaseController
         }else{
             $warse['supplier_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']!=""){
             $type = Db::name("warehouse_type")->where(["id"=>$warse['wsm_type']])->find();
             $warse['type_name'] = isset($type['name']) ? $type['name'] :"";
@@ -236,7 +248,7 @@ class WareHouse extends BaseController
                 'contactor'=>$contactor,
                 'mobile'=>$mobile,
                 'position'=>$position,
-                "addrs_code"=>$addrs_code,
+                "addrs_code"=>json_encode($addrs_code),
                 'updatetime'=>date("Y-m-d H:i:s")
             ];
             $add = Db::name('warehouse_info')->where($warse)->update($data);
@@ -246,7 +258,7 @@ class WareHouse extends BaseController
                     "wsm_name"=>$wsm_name,
                     "wsm_mobile"=>$wsm_mobile,
                     "wsm_addr"=>$wsm_addr,
-                    "addr_code"=>$addr_code,
+                    "addr_code"=>json_encode($addr_code),
                     "updatetime"=>date("Y-m-d H:i:s"),
                 ];
              $addri = DB::name("warehouse_addr")->where(["wsm_code"=>$warse['wsm_code'],"is_del"=>0])->update($addrinfo);