Merge branch 'version1.5' of wugg/phpstock into master-online

app/admin/controller/Check.php

@@ -57,19 +57,17 @@ 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(["is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
         $condtion[]=['c.wsm_code',"in",$wsmcode];
     }
     $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
     if ($companyNo !== "") {
-        $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column
-        ("wsm_code");
+        $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
         $condition[]=["c.wsm_code","in",$wsmcode];
     }
     $stock_low =isset($this->post['stock_low']) &&$this->post['stock_low'] !=="" ? intval($this->post['stock_low'])
         :"";
     if($stock_low!=""){
-       // $condtion['c.usable_stock'] = Db::raw(">= $stock_low");
         $condtion[]=['c.usable_stock',">=",$stock_low];
     }
     $stock_max =isset($this->post['stock_max']) &&$this->post['stock_max'] !=="" ? intval($this->post['stock_max'])

app/admin/controller/Good.php

@@ -320,7 +320,7 @@ class Good extends Base
         $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
             :"";
         if($suplierNo!==""){
-            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["a.wsm_code","in",$wsmcode];
         }
        $list = Db::name("good_stock")->alias("a")->join("warehouse_info b","a.wsm_code=b.wsm_code","left")->join("supplier c","b.supplierNo=c.code","left")
@@ -353,12 +353,12 @@ class Good extends Base
       $suplierNo = isset($this->post['suplierNo']) &&$this->post['suplierNo'] !=="" ? trim($this->post['suplierNo'])
           :"";
       if($suplierNo!==""){
-          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
       if ($companyNo !== "") {
-          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $start = isset($this->post['start']) &&$this->post['start'] !=="" ? $this->post['start']:"";
@@ -428,12 +428,12 @@ class Good extends Base
       $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
           :"";
       if($suplierNo!==""){
-          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
       if ($companyNo !== "") {
-          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column("wsm_code");
+          $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
           $condition[]=["wsm_code","in",$wsmcode];
       }
       $build= Db::name("good_stock")->where($condition)->group("wsm_code")->field("wsm_code")->buildSql();
@@ -530,13 +530,13 @@ class Good extends Base
         }
         $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
         if($suplierNo!==""){
-            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
             // $where['khNo'] = $khNo;
-            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>1,"is_del"=>0])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
@@ -605,14 +605,12 @@ class Good extends Base
             if(empty($supplier)){
                 return error_show(1004,"未找到供应商信息");
             }
-            $wsmcode = Db::name("warehouse_info")->where([
-                "is_del"=>0,"wsm_type"=>5,"supplierNo"=>$supplierNo])->column("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(["is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
             $where[]=['b.wsm_code',"in",$wsmcode];
         }
         $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
         if ($companyNo !== "") {
-            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"wsm_type"=>5,"is_del"=>0])->column
-            ("wsm_code");
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["b.wsm_code","in",$wsmcode];
         }
         $count = Db::name("good_log")->alias('a')
@@ -629,7 +627,7 @@ class Good extends Base
             $db = Db::name("depart_user")->where(['uid'=>$value['action_uid']])->column("itemid");
             $item = Db::name("company_item")->where(['id'=>$db])->column("id,name");
             $wsm = Db::name("warehouse_info")->alias("a")->Join("supplier b","a.supplierNo=b.code","left")->where
-            (['a.wsm_code'=>$value['wsm_code'],"a.wsm_type"=>1,"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
+            (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")->find();
             $godd =Db::name("good")->where(["spuCode"=>$value['spuCode'],"is_del"=>0])->find();
             $value['good_name']=isset($godd['good_name'])? $godd['good_name']:"";
             $value['cat_id']=isset($godd['cat_id'])? $godd['cat_id']:"";

app/admin/controller/WareHouse.php

@@ -164,6 +164,10 @@ class WareHouse extends BaseController
         if($contactor_name!=""){
             $condition[]=["a.contactor_name","like","%{$contactor_name}%"];
         }
+        $wsm_name = isset($post['wsm_name'])&&$post['wsm_name']!="" ? trim($post['wsm_name']) :"";
+        if($wsm_name!=""){
+            $condition[]=["a.name","like","%{$wsm_name}%"];
+        }
         $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")->alias("a")->join("warehouse_addr b ","a.wsm_code=b.wsm_code","left")