Prechádzať zdrojové kódy

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

wugg 3 rokov pred
rodič
commit
8d4e537fc8
1 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 2 2
      app/admin/controller/Check.php

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

@@ -508,10 +508,10 @@ public function edit()
         if(empty($fo)){
             return error_show(1003,"未找到盘点信息");
         }
-        $list = Db::name("good")->alias("b")
+        $list = Db::name("good_basic")->alias("b")
             ->join("good_stock c","c.spuCode=b.spuCode","left")
             ->where(['c.wsm_code'=>$fo['wsm_code'],"a.is_del"=>0,"b.is_del"=>0,"c.is_del"=>0])->field("b.spuCode'商品编码',
-            b.good_name '商品名称',b.good_desc '商品描述',b.brand_id '品牌',b.good_unit '单位',b.supplierNo '供应商编码','' as '供应商名称','' as  '一级分类','' as '二级分类','' as  '三级分类',
+            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 '可用库存','' as '盘点库存'")
             ->select();
         $data=[];