ad

app/admin/controller/Good.php

@@ -758,7 +758,7 @@ class Good extends Base
             ->page($page,$size)
             ->leftJoin('warehouse_info whi','whi.wsm_code=gs.wsm_code AND whi.is_del=0')
             ->group("gs.wsm_code")
-            ->field("gs.wsm_code,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(usable_stock+wait_out_stock) total_stock")
+            ->field("gs.wsm_code,whi.wsm_type,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(usable_stock+wait_out_stock) total_stock")
             ->select()
             ->toArray();
 
@@ -868,9 +868,6 @@ 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];
@@ -913,7 +910,7 @@ class Good extends Base
                         ->join("warehouse_info b", "a.wsm_code=b.wsm_code", "left")
                         ->where(['a.spuCode' => $value['spuCode'], "a.is_del" => 0])
                         ->where("b.wsm_type","<>",2)
-                        ->field("a.wsm_code,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,(a.wait_out_stock+a.usable_stock) total_stock,a.warn_stock,b.supplierNo,b.companyNo,b.contactor_name")
+                        ->field("a.wsm_code,,b.wsm_type,b.name wsm_name,a.wait_in_stock,a.wait_out_stock,a.usable_stock,a.intra_stock,(a.wait_out_stock+a.usable_stock) total_stock,a.warn_stock,b.supplierNo,b.companyNo,b.contactor_name")
                         ->select()
                         ->toArray();
 

app/admin/controller/Goodup.php

@@ -208,8 +208,9 @@ class Goodup extends Base
                 $value['noble_name']=isset($value['noble_metal'])&&$value['noble_metal']!=0?$this->noble[$value['noble_metal']] :"";
 
             //如果一个spucode在任意平台上线，那么就视为它上线，即手动把它的is_online值改为1
-            if (isset($exam_statuss[$value['spuCode']]) || isset($exam_status_yz[$value['spuCode']]))  $value['is_online'] = 1;
-
+           $value['is_online'] = 0;
+            if (isset($exam_statuss[$value['spuCode']]) || isset($exam_status_yz[$value['spuCode']])) $value['is_online'] = 1;
+			else $value['is_online'] = 0;
             $value['charger_company_name'] = $item[$value['chargerid']]??'';
 
             $value['has_account'] = (int)isset($account[$value['supplierNo']]);

app/admin/controller/SaleReport.php

@@ -2424,7 +2424,7 @@ class SaleReport extends Base
         $data = Db::name('sale')
             ->alias('a')
             ->field("a.orderCode 订单编号,a.order_type 订单类型,
-            a.good_code 商品成本编码,a.skuCode 商品上线编码,a.good_name 商品名称,
+            a.good_code 商品成本编码,a.skuCode 商品上线编码,a.good_name 商品名称,a.supplierName 业务公司,a.sale_price 商品单价,
             a.good_num 购买数量,a.send_num 已发货数量,a.wsend_num 未发货数量,a.status 订单状态,
             a.apply_name 申请人名称,a.apply_id 申请人所属部门, 
             a.good_num-a.th_num - IFNULL((select sum(receipt_quantity) from wsm_order_addr where orderCode=a.orderCode and is_del=0),0) 无地址数量,