q

app/admin/controller/Check.php

@@ -15,14 +15,14 @@ public function __construct(App $app)
 {
     parent::__construct($app);
     $this->post=$this->request->post();
-//    $token = isset($this->post['token']) ? trim($this->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($this->post['token']) ? trim($this->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']);
+    }
 }
 public function flist(){
     $page = isset($this->post['page']) &&$this->post['page'] !=="" ? intval($this->post['page']):1;
@@ -57,8 +57,7 @@ public function flist(){
         if(empty($supplier)){
             return error_show(1004,"未找到供应商信息");
         }
-                $wsmcode = Db::name("warehouse_info")->where(["wsm_type"=>1,
-                    "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
+                $wsmcode = Db::name("warehouse_info")->where(["wsm_type"=>1,"is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
         //$condtion["c.wsm_code"] = $wsmcode;
         $condtion[]=['c.wsm_code',"in",$wsmcode];
     }

app/admin/controller/Good.php

@@ -281,7 +281,7 @@ class Good extends \app\BaseController
           $temp['wait_out_stock'] = $value['wait_out_stock'];
           $temp['intra_stock'] = $value['intra_stock'];
           $temp['total_stock'] = $value['total_stock'];
-          $temp['warn_stock'] = $value['warn_stock'];
+         // $temp['warn_stock'] = $value['warn_stock'];
           $temp['child']=isset($good)&&!empty($good) ? $good:[];
           $data[]=$temp;
       }
@@ -291,25 +291,28 @@ class Good extends \app\BaseController
     public function GetStockGod(){
         $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;
-        $condition = [["a.is_del","=",0],["b.is_del","=",0]];
+        $condition = [["a.is_del","=",0],["b.is_del","=",0],["c.usable_stock",">",0]];
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code'])
             :"";
         if($type_code!==""){
             $condition[]=["b.type_code","like","%{$type_code}%"];
         }
-        $count = Db::name("good_type")->alias("b")->join("good a","a.good_code = b.good_code","left")
-            ->where($condition)->count();
+        $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($condition)->group("a.good_code,a.good_name,a.unit,a.sort_f,b.type_code,b.attribute,a.addtime")->count();
         $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")
-            ->where($condition)->field("a.good_code,a.good_name,a.unit,a.sort_f,b.type_code,b.attribute,a.addtime")
-            ->page($page,$size)->order("a.addtime desc")->select();
+        $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($condition)->field("a.good_code,a.good_name,a.unit,a.sort_f,b.type_code,b.attribute,a.addtime,sum(c.wait_in_stock) wait_in_stock,
+                sum(c.wait_out_stock) wait_out_stock,sum(c.usable_stock) usable_stock,sum(c.intra_stock) intra_stock,sum(c.warn_stock) warn_stock,sum(c.total_stock) total_stock")
+            ->page($page,$size)->order("a.addtime desc")->group("a.good_code,a.good_name,a.unit,a.sort_f,b.type_code,b.attribute,a.addtime")->select();
+       // echo Db::name("good_type")->getLastSql();
         $data=[];
         foreach ($list as $key=>$value){
             $temp=[];
             if($value['type_code']!=""){
-                $wsm = Db::name("good_stock")->where(['good_type_code'=>$value['type_code'],"is_del"=>0])->field("sum(wait_in_stock) wait_in_stock,
-                sum(wait_out_stock) wait_out_stock,sum(usable_stock) usable_stock,sum(intra_stock) intra_stock,sum(warn_stock) warn_stock,sum(total_stock) total_stock")
-                 ->find();
                 $child = Db::name("good_stock")->alias("a")->join("warehouse_info b","a.wsm_code=b.wsm_code","left")
                     ->where(['a.good_type_code'=>$value['type_code'],"b.wsm_type"=>1,"a.is_del"=>0])->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.warn_stock")->select();
             }
@@ -320,12 +323,12 @@ class Good extends \app\BaseController
             $temp['sort_f']=$value['sort_f'];
             $temp['attribute']=$value['attribute'];
             $temp['addtime']=$value['addtime'];
-            $temp['usable_stock'] = isset($wsm['usable_stock'])? $wsm['usable_stock']:"";
-            $temp['wait_in_stock'] = isset($wsm['wait_in_stock'])? $wsm['wait_in_stock']:"";
-            $temp['wait_out_stock'] = isset($wsm['wait_out_stock'])? $wsm['wait_out_stock']:"";
-            $temp['intra_stock'] = isset($wsm['intra_stock'])? $wsm['intra_stock']:"";
-            $temp['total_stock'] = isset($wsm['total_stock'])? $wsm['total_stock']:"";
-            $temp['warn_stock'] = isset($wsm['warn_stock'])? $wsm['warn_stock']:"";
+            $temp['usable_stock'] = isset($value['usable_stock'])? $value['usable_stock']:"";
+            $temp['wait_in_stock'] = isset($value['wait_in_stock'])? $value['wait_in_stock']:"";
+            $temp['wait_out_stock'] = isset($value['wait_out_stock'])? $value['wait_out_stock']:"";
+            $temp['intra_stock'] = isset($value['intra_stock'])? $value['intra_stock']:"";
+            $temp['total_stock'] = isset($value['total_stock'])? $value['total_stock']:"";
+           // $temp['warn_stock'] = isset($value['warn_stock'])? $value['warn_stock']:"";
             $temp['child']=isset($child)&&!empty($child) ? $child:[];
             $data[]=$temp;
         }

app/admin/controller/WareHouse.php

@@ -36,6 +36,9 @@ class WareHouse extends BaseController
         if(empty($supplierinfo)){
             return error_show(1004,'未找到供应商数据');
         }
+        if($name==$supplierinfo['name']){
+            return error_show(1004,'仓库名不可以与供应商名称相同');
+        }
         $wsmtype = isset($post['wsmtype'])&& $post['wsmtype']!='' ?intval($post['wsmtype']) :'';
         if($wsmtype==''){
             return error_show(1004,'参数wsmtype 不能为空');
@@ -45,6 +48,7 @@ class WareHouse extends BaseController
         if(!empty($isT)){
             return error_show(1004,'仓库名称已存在');
         }
+
         $addr = isset($post['addr'])&& $post['addr']!='' ?trim($post['addr']) :'';
         if($addr==''){
             return error_show(1004,'参数addr 不能为空');