Merge branch 'plm' of ssh://192.168.10.210:10022/wugg/stock into plm

app/admin/controller/Good.php

@@ -138,7 +138,9 @@ class Good extends \app\BaseController
         }
        $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")
            ->where($condition)->field("a.id,b.name as wsm_name,c.code,c.name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,a.total_stock,a.status,a.warn_stock")->select();
-        //echo Db::name("good_stock")->getLastSql();
+        if(empty($list)){
+            return error_show(1004,"未找到数据");
+        }
      return app_show(0,"获取成功",$list);
     }
 
@@ -154,7 +156,7 @@ class Good extends \app\BaseController
       $condition = [["is_del","=",0]];
       $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
       if($type_code!==""){
-          $condition[]=["good_type_code","=",$type_code];
+          $condition[]=["good_type_code","like","%{$type_code}%"];
       }
       $wsm_code = isset($this->post['wsm_code']) &&$this->post['wsm_code'] !=="" ? trim($this->post['wsm_code'])
           :"";
@@ -182,10 +184,14 @@ class Good extends \app\BaseController
       foreach ($list as $key=>$value){
           $temp=[];
           if($value['wsm_code']!=""){
-              $wsm = Db::name("warehouse_info")->where(['wsm_code'=>$value['wsm_code'],"is_del"=>0])->find();
+              $wsm = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")->where
+              (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")
+                  ->find();
           }
-          $temp['wsm_name'] = isset($wsm['name'])?$wsm['name']:"";
+          $temp['wsm_name'] = isset($wsm['wsm_name'])?$wsm['wsm_name']:"";
           $temp['wsm_code']=$value['wsm_code'];
+          $temp['supplier_code']=isset($wsm['code'])?$wsm['code']:"";
+          $temp['supplier_name']=isset($wsm['name'])?$wsm['name']:"";
           if($value['good_type_code']!=""){
               $good=Db::name("good_type")->alias("a")->join("good b","a.good_code=b.good_code","left")->where(["a.type_code"=>$value['good_type_code'],"a.is_del"=>0,"b.is_del"=>0])
                   ->field("a.good_code,a.type_code,b.good_name,b.unit,a.attribute,b.sort_f")->find();
@@ -203,6 +209,8 @@ class Good extends \app\BaseController
           $temp['total_stock'] = $value['total_stock'];
           $temp['warn_stock'] = $value['warn_stock'];
           $temp['id'] = $value['id'];
+          $temp['out_total'] =0;
+          $temp['in_total'] = 0;
           $temp['addtime'] = $value['addtime'];
           $data[]=$temp;
       }
@@ -241,14 +249,18 @@ class Good extends \app\BaseController
       foreach ($list as $key=>$value){
           $temp=[];
           if($value['wsm_code']!=""){
-              $wsm = Db::name("warehouse_info")->where(['wsm_code'=>$value['wsm_code'],"is_del"=>0])->find();
+              $wsm = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")->where
+              (['a.wsm_code'=>$value['wsm_code'],"a.is_del"=>0])->field("a.name as wsm_name,wsm_code,b.code,b.name")
+                  ->find();
               $good = Db::name("good_stock")->alias("a")->join("good_type b","a.good_type_code=b.type_code","left")
                   ->join("good c","c.good_code=b.good_code","left")->where(["a.wsm_code"=>$value['wsm_code'],"a.is_del"=>0,"b.is_del"=>0,"c.is_del"=>0])
                   ->field("c.good_code,a.good_type_code,c.good_name,b.attribute,c.sort_f,c.unit,a.usable_stock,a.wait_in_stock,a.wait_out_stock,a.intra_stock,a.total_stock,a.warn_stock")
                   ->select();
           }
-          $temp['wsm_name'] = isset($wsm['name'])?$wsm['name']:"";
+          $temp['wsm_name'] = isset($wsm['wsm_name'])?$wsm['wsm_name']:"";
           $temp['wsm_code']=$value['wsm_code'];
+          $temp['supplier_code']=isset($wsm['code'])?$wsm['code']:"";
+          $temp['supplier_name']=isset($wsm['name'])?$wsm['name']:"";
           $temp['usable_stock'] = $value['usable_stock'];
           $temp['wait_in_stock'] = $value['wait_in_stock'];
           $temp['wait_out_stock'] = $value['wait_out_stock'];
@@ -268,7 +280,7 @@ class Good extends \app\BaseController
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code'])
             :"";
         if($type_code!==""){
-            $condition[]=["b.type_code","=",$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();

app/admin/controller/Group.php

@@ -49,8 +49,7 @@ class Group extends BaseController
                 $user = GetUserlist($token, $cond);
                 if ($user['code'] == 0 && !empty($user['data'])) {
                     foreach ($user['data'] as $v) {
-
-                        $userlist[] = isset($v['nickname']) ?$v['nickname']:"";
+                       $userlist[] = isset($v['nickname']) ?$v['nickname']:"";
                     }
                 }
             }

app/admin/controller/Purchin.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace app\admin\controller;
+use app\BaseController;
+use think\facade\Db;
+
+class Purchin extends BaseController
+{
+    public $post="";
+    public function __construct(App $app)
+    {
+        parent::__construct($app);
+        $this->post=$this->request->post();
+
+    }
+
+    public  function  list(){
+
+    }
+    public function  add(){}
+}