ad

app/admin/controller/Good.php

@@ -856,7 +856,6 @@ class Good extends Base
     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 = [["b.is_del","=",0],["c.usable_stock",">",0],["a.wsm_type","<>",2]];
         $condition = [["b.is_del", "=", 0], ["a.wsm_type", "<>", 2],['b.is_stock','=',1]];//库存为0的也要显示出来
         $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
         if($type_code!==""){
@@ -869,10 +868,15 @@ class Good extends Base
 
         $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
         if($relaComNo!="") $condition[]=['b.companyNo','=', $relaComNo];
-
+	
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!='' ? trim($this->post['relaComNo']):'';
+        if($relaComNo!='') $condition[]=['b.companyNo','=', $relaComNo];
+        
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo']!="" ? trim($this->post['supplierNo']):"";
         if($supplierNo!=="") $condition[]=['b.supplierNo','=', $supplierNo];
-
+		$isZero=isset($this->post['isZero']) && $this->post['isZero']!='' ? intval($this->post['isZero']):0;
+		  if($isZero!==0) $condition[]=['c.wait_in_stock|c.wait_out_stock|c.usable_stock|c.intra_stock','<>',
+		 0];
         $count = Db::name("good_basic")
             ->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")

app/admin/controller/SaleReport.php

@@ -1548,7 +1548,7 @@ class SaleReport extends Base
             thd.addtime return_time,thd.thCode,"" outCode,"" status,s.apply_name,s.apply_id apply_company,thd.orderCode,s.addtime,s.customerName companyName,s.good_name,s.sale_price,s.wsend_num,thd.th_num,thd.th_fee,"" contactor,"" mobile,"" addr,"" result')
             ->leftJoin('sale s', 's.orderCode=thd.orderCode')
             ->where($where)
-            ->limit($param['page'],$param['size'])
+            ->page($param['page'],$param['size'])
             ->order('thd.addtime', 'desc')
             ->select()
             ->toArray();

app/common.php

@@ -1673,7 +1673,7 @@ if(function_exists('cat_is_gold')==false){
 //是否是渠道
 if(function_exists('channel_is_company')==false){
     function channel_is_company($platform_id,$companyNo){
-    	return false;
+//    	return false;
     	$platform=Db::name("platform_channel")
     	->alias("a")
     	->leftJoin("channel b","a.channel_id=b.id")