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

app/admin/controller/Purchin.php

@@ -85,7 +85,7 @@ class Purchin extends BaseController
         $page = $page >= $total ? $total : $page;
         $list = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
             ->where($where)->page($page,$size)
-            ->field("a.apply_name,a.sendtime,b.order_type,a.status,a.cgdNo,a.wsm_in_code,b.good_name,a.send_num,a.wsm_code,b.good_name,b.good_code,
+            ->field("a.apply_name,a.sendtime,b.order_type,a.status,a.cgdNo,a.wsm_in_code,a.send_num,a.wsm_code,b.good_name,b.spuCode,
             a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode,b.supplierNo")
             ->order("a.addtime desc")->select();
         $data=[];
@@ -245,7 +245,7 @@ class Purchin extends BaseController
             return error_show(1004,"未找到数据");
         }
         $dom = Db::name("purchease_order")->where(['cgdNo'=>$info['cgdNo'],'is_del'=>0])->find();
-        $goon = Db::name('good')->where(['good_code'=>$dom['good_code']])->field("cat_id")->find();
+        $goon = Db::name('good')->where(['spuCode'=>$dom['spuCode']])->field("cat_id")->find();
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
         }

app/admin/controller/WareHouse.php

@@ -140,6 +140,10 @@ class WareHouse extends BaseController
         if($supplier!=""){
             $condition[]=["supplierNo","=",$supplier];
         }
+        $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+        if($companyNo!=""){
+            $condition[]=["companyNo","=",$companyNo];
+        }
         $wsm_code = isset($post['wsm_code'])&&$post['wsm_code']!="" ? trim($post['wsm_code']) :"";
         if($wsm_code!=""){
             $condition[]=["a.wsm_code","like","%{$wsm_code}%"];