0309

app/admin/controller/Brand.php

@@ -52,31 +52,41 @@ class Brand extends BaseController
             return error_show(1002,"新建失败");
         }
     }
-    public function list(){
-        $page = isset($this->post['page']) && $this->post['page'] !==""? intval($this->post['page']):"1";
-        $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
-        $where=[["is_del","=",0]];
-        $brand_name = isset($this->post['brand_name']) && $this->post['brand_name'] !=="" ? trim($this->post['brand_name']):"";
-        if($brand_name!==""){
-            $where[]=['brand_name',"like","%$brand_name%"];
-        }
-        $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status'])
-            :"";
-        if($status!==""){
-            $where[]=['status',"=",$status];
-        }
-        $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
-        if($creater!==""){
-            $where[]=['creater',"like","%$creater%"];
-        }
-        $start = isset($this->post['start']) && $this->post['start']!=="" ? $this->post['start']:"";
-        if($start!==""){
-            $where[]=['addtime',">=",date('Y-m-d H:i:s',strtotime($start))];
-        }
-        $end = isset($this->post['end']) && $this->post['end']!=="" ? $this->post['end']:"";
-        if($end!==""){
-            $where[]=['addtime',"<",date('Y-m-d H:i:s',strtotime($end)+24*3600)];
-        }
+    public function list()
+    {
+        $page = isset($this->post['page']) && $this->post['page'] !== "" ? intval($this->post['page']) : "1";
+        $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
+        $where = [["is_del", "=", 0]];
+        $brand_name = isset($this->post['brand_name']) && $this->post['brand_name'] !== "" ? trim($this->post['brand_name']) : "";
+        if ($brand_name !== "") {
+            $where[] = ['brand_name', "like", "%$brand_name%"];
+        }
+        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status'])
+            : "";
+        if ($status !== "") {
+            $where[] = ['status', "=", $status];
+        }
+        $creater = isset($this->post['creater']) && $this->post['creater'] !== "" ? trim($this->post['creater']) : "";
+        if ($creater !== "") {
+            $where[] = ['creater', "like", "%$creater%"];
+        }
+        $start = isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start'] : "";
+        if ($start !== "") {
+            $where[] = ['addtime', ">=", date('Y-m-d H:i:s', strtotime($start))];
+        }
+        $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] : "";
+        if ($end !== "") {
+            $where[] = ['addtime', "<", date('Y-m-d H:i:s', strtotime($end) + 24 * 3600)];
+        }
+        $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] != "" ? trim($this->post['supplierNo']) : "";
+        if($supplierNo!=""){
+            $gyscode = Db::name("supplier")->where(["code"=>$supplierNo])->find();
+            if(empty($gyscode)){
+                return error_show(1004,"未找到供应商信息");
+            }
+        $wsmcode = Db::name("brand_book")->where(["gyscode" => $supplierNo, "is_del" => 0])->column("brand_id");
+        $where[] = ['id', "in", $wsmcode];
+    }
         $count = Db::name('brand') ->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Cat.php

@@ -51,9 +51,36 @@ public function plist(){
     $total = ceil($count / $size);
     $page = $page >= $total ? $total : $page;
     $list = Db::name('cat')->where($where)->page($page, $size)->select();
-    return app_show(0, "获取成功", ['list' => $list, 'count' => $count]);
+    return app_show(0, "获取成功", ['list' =>$list, 'count' => $count]);
 }
 
+    public function wlist(){
+        $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']) :"1";
+        $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']) :"10";
+        $where =[["is_del","=",0],['level',"=",3]];
+        $cat_name=isset($this->post['cat_name']) && $this->post['cat_name'] !==""? trim($this->post['cat_name']) :"";
+        if($cat_name!==""){
+            $where[]=['cat_name',"like","%$cat_name%"];
+        }
+        $search=isset($this->post['search']) && $this->post['search'] !==""? trim($this->post['search']) :"";
+        if($search!==""){
+            $where[]=['search',"like","%$search%"];
+        }
+        $pid=isset($this->post['pid']) && $this->post['pid'] !==""? intval($this->post['pid']) :"";
+        if($pid!==""){
+            $where[]=['pid',"=",$pid];
+        }
+        $status=isset($this->post['status']) && $this->post['status'] !==""? intval($this->post['status']) :"";
+        if($status!==""){
+            $where[]=['status',"=",$status];
+        }
+        $count = Db::name("cat")->where($where)->count();
+        $total = ceil($count / $size);
+        $page = $page >= $total ? $total : $page;
+        $list = Db::name('cat')->where($where)->page($page, $size)->select();
+        return app_show(0, "获取成功", ['list' =>$list, 'count' => $count]);
+    }
+
 public function title(){
     $where =[["is_del","=",0]];
     $cat_name=isset($this->post['cat_name']) && $this->post['cat_name'] !==""? trim($this->post['cat_name']) :"";
@@ -112,15 +139,23 @@ public function create()
     if ($pid === "") {
         return error_show(1002, "参数pid不能为空");
     }
+
     $cat_desc = isset($this->post['cat_desc']) && $this->post['cat_desc'] !== "" ? trim($this->post['cat_desc']) : "";
     $fund_code = isset($this->post['fund_code']) && $this->post['fund_code'] !== "" ? trim($this->post['fund_code']) : "";
-    $levl=Db::name('cat')->where(['id'=>$pid])->find();
+
     $level =1;
     if ($pid !== 0) {
+        $levl=Db::name('cat')->where(['id'=>$pid])->find();
         if(empty($levl)){
             return error_show(1002,"未找到父级数据");
         }
         $level =$levl['level']+1;
+        $temp = $levl['search'];
+    }
+    if($level==1){
+        $search = $cat_name;
+    }else{
+        $search= $temp."-".$cat_name;
     }
     $repeat_name = Db::name("cat")->where(["is_del"=>0,"cat_name"=>$cat_name])->find();
     $int =isset($repeat_name['id']) && $repeat_name['id'] != 0 ? made($repeat_name['id']) : [];
@@ -155,6 +190,8 @@ public function create()
             "cat_name" => $cat_name,
             "pid" => $pid,
             "level" => $level,
+            "search" => $search,
+            "specs_id"=>$specs_id,
 //            "rate" => $rate,
 //            "lower_rate"=>$lower_rate,
 //            "order_rate"=>$order_rate,
@@ -242,9 +279,25 @@ public function edit(){
     if(empty($user)||$user['code']!=0){
         return error_show(1002,"创建人数据不存在");
     }
+
+    $level =1;
+    if ($pid !== 0) {
+        $levl=Db::name('cat')->where(['id'=>$pid])->find();
+        if(empty($levl)){
+            return error_show(1002,"未找到父级数据");
+        }
+        $level =$levl['level']+1;
+        $temp = $levl['search'];
+    }
+    if($level==1){
+        $search = $cat_name;
+    }else{
+        $search= $temp."_".$cat_name;
+    }
     $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
     $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-    $level = isset($this->post['level']) && $this->post['level'] !=="" ? intval($this->post['level']) :"";
+    //$level = isset($this->post['level']) && $this->post['level'] !=="" ? intval($this->post['level']) :"";
+
     $weight = isset($this->post['weight']) && $this->post['weight']!==""? intval($this->post['weight']):"0";
     $status = isset($this->post['status']) && $this->post['status'] !==""?intval($this->post['status']) :"1";
     Db::startTrans();
@@ -258,7 +311,8 @@ public function edit(){
             "status"=>$status,
             "cat_desc"=>$cat_desc,
             "is_del"=>0,
-            "updatetime"=>date("Y-m-d H:i:s")
+            "updatetime"=>date("Y-m-d H:i:s"),
+            "search"=>$search
         ];
         $strinfo = Db::name('cat')->where(['id'=>$id])->save($str);
         if($strinfo){
@@ -348,6 +402,8 @@ public function edit(){
         $order_rate = isset($this->post['order_rate']) && $this->post['order_rate'] !== "" ? floatval($this->post['order_rate']) : "";
         $sale_rate = isset($this->post['sale_rate']) && $this->post['sale_rate'] !== "" ?  floatval($this->post['sale_rate']) : "";
         $lower_rate = isset($this->post['lower_rate']) && $this->post['lower_rate'] !== "" ?  floatval($this->post['lower_rate']) :"";
+        $money_rate = isset($this->post['money_rate']) && $this->post['money_rate'] !=="" ? floatval($this->post['money_rate']):"";
+        $low_rate = isset($this->post['low_rate']) && $this->post['low_rate'] !=="" ? floatval($this->post['low_rate']):"";
         if($idinfo['pid']==0){
             if($rate===""){
                 return error_show(1003,"参数rate不能为空");
@@ -361,6 +417,12 @@ public function edit(){
             if($lower_rate===""){
                 return error_show(1003,"参数lower_rate不能为空");
             }
+            if($money_rate==""){
+                return error_show(1003,"参数money_rate不能为空");
+            }
+            if($low_rate==""){
+                return error_show(1003,"参数low_rate不能为空");
+            }
         }
         $data =[
             "id"=>$id,
@@ -368,8 +430,10 @@ public function edit(){
             "lower_rate"=>$lower_rate,
             "order_rate"=>$order_rate,
             "sale_rate"=>$sale_rate,
+            "money_rate"=>$money_rate,
+            "low_rate"=>$low_rate,
             "is_del"=>0,
-            "updatetime"=>date("Y-m-d H:i:s")
+            "updatetime"=>date("Y-m-d H:i:s"),
         ];
         $strinfo = Db::name('cat')->where(['id'=>$id])->save($data);
         if($strinfo){
@@ -407,13 +471,35 @@ public function status(){
     if($status===""){
         return error_show(1002,"参数status不能为空");
     }
-    $pd= $stn['status'];
-    $stn['status']=$status;
-    $stn['updatetime']=date("Y-m-d H:i:s");
-    $str = Db::name('cat')->where(['id'=>$id])->save($stn);
+    if ($stn['level']==3) {
+        if($status==1){
+            $can = made($stn['id']);
+            $cat=array_column($can,'id');
+        }else{
+           $cat =$stn['id'];
+        }
+       // return error_show(1002, "所在级别不能启用");
+    }
+    if($stn['level']==2 || $stn['level']==1){
+        if($status==1){
+            return error_show(1002,"所在等级不能启用");
+        }else{
+            $db= Db::name('cat')->where(['pid'=>$stn['id'],'status'=>1,'is_del'=>0])->count();
+            if($db==0){
+                $cat = $stn['id'];
+            }else{
+                return error_show(1002,"子级分类未禁用");
+            }
+        }
+    }
+   // $pd= $stn['status'];
+    $it=[];
+    $it['status']=$status;
+    $it['updatetime']=date("Y-m-d H:i:s");
+    $str = Db::name('cat')->where(['id'=>$cat,'is_del'=>0])->save($it);
     if($str){
-        $order = ["order_code"=>$id,"status"=>$pd,"action_remark"=>'',"action_type"=>"edit"];
-        ActionLog::logAdd($this->post['token'],$order,"sxd",$stn['status'],$order);
+//        $order = ["order_code"=>$id,"status"=>$pd,"action_remark"=>'',"action_type"=>"edit"];
+//        ActionLog::logAdd($this->post['token'],$order,"sxd",$stn['status'],$order);
         return error_show(0,"状态更新成功");
     }else{
         return error_show(1002,"状态更新失败");

app/admin/controller/Unit.php

@@ -88,6 +88,9 @@ class Unit extends BaseController
         if($info==""){
             return error_show(1003,"未找到数据");
         }
+        if($info['status'==1]){
+            return error_show(1002,"状态是启用状态，无法编辑");
+        }
         $unit = isset($this->post['unit']) && $this->post['unit'] !==""? trim($this->post['unit']):"";
         if($unit==""){
             return error_show(1002,"参数unit不能为空");
@@ -102,7 +105,7 @@ class Unit extends BaseController
         }
         $createrid= isset($user["data"]['id']) ?  $user["data"]['id'] : "";
         $creater= isset($user["data"]['nickname']) ?  $user["data"]['nickname'] : "";
-        $status = isset($this->post['status']) &&$this->post['status'] !==""? intval($this->post['status']):"0";
+        $status = isset($this->post['status']) &&$this->post['status'] !==""? intval($this->post['status']):"1";
         $data=[
             "id"=>$id,
             "unit"=>$unit,

app/admin/route/app.php

@@ -225,6 +225,7 @@ Route::rule('cattitle','admin/Cat/title');
 Route::rule('delete','admin/Cat/delete');
 Route::rule('cattlist','admin/Cat/tlist');
 Route::rule('catratedit','admin/Cat/ratedit');
+Route::rule('catwlist',"admin/Cat/wlist");
 
 
 Route::rule('backcreate','admin/Purchback/create');