Browse Source

Merge branch 'dev_wf' of wugg/phpstock into version1.5

wufeng 2 years ago
parent
commit
1d6b1fa81c
1 changed files with 1 additions and 1 deletions
  1. 1 1
      app/admin/controller/Check.php

+ 1 - 1
app/admin/controller/Check.php

@@ -558,7 +558,7 @@ public function list()
         }
         $list = Db::name("good_stock_info")->alias("d")
             ->join("good_stock c","c.id=d.stockid and d.balance_num>0","left")
-            ->join("good b","c.spuCode=b.spuCode","left")
+            ->join("good_basic b","c.spuCode=b.spuCode","left")
             ->where(['c.wsm_code'=>$fo['wsm_code'],"b.is_del"=>0,"c.is_del"=>0])->field("d.bnCode '商品批次号',b.spuCode'商品编码',
             b.good_name '商品名称',b.craft_desc '商品描述',b.brand_id '品牌',b.good_unit '单位',b.supplierNo '供应商编码','' as '供应商名称','' as  '一级分类','' as '二级分类','' as  '三级分类',
             b.addtime '新建时间',c.wsm_code '仓库编码','' as '仓库名称',c.usable_stock '可用总库存',d.balance_num '批次库存数','' as '盘点库存'")