wugg 3 years ago
parent
commit
8b51c4215a
3 changed files with 6 additions and 2 deletions
  1. 1 1
      .env
  2. 1 0
      .gitignore
  3. 4 1
      app/admin/controller/Resign.php

+ 1 - 1
.env

@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn
+APP_DEBUG = false

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai


[LANG]
default_lang = zh-cn

+ 1 - 0
.gitignore

@@ -9,4 +9,5 @@ LICENSE.txt
 /public/nginx.htaccess
 /public/nginx.htaccess
 /public/storage/
 /public/storage/
 /config/
 /config/
+.env
 
 

+ 4 - 1
app/admin/controller/Resign.php

@@ -223,11 +223,14 @@ class Resign extends BaseController
         if(empty($info)){
         if(empty($info)){
             return error_show(1002,'未找到数据');
             return error_show(1002,'未找到数据');
         }
         }
-        $goon = Db::name('good')->where(['good_code'=>$info['good_code']])->field("cat_id")->find();
+        $goon = Db::name('good')->alias("a")->leftJoin("good_type b","a.good_code=b.good_code")->where
+        (['a.good_code'=>$data['good_code']])->field("cat_id,noble_metal")->find();
         if(empty($goon)){
         if(empty($goon)){
             return error_show(1002,"未找到商品数据");
             return error_show(1002,"未找到商品数据");
         }
         }
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
         $int= isset($goon['cat_id']) && $goon['cat_id'] !=0 ? made($goon['cat_id']):[];
+        $data['noble_metal']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? $goon['noble_metal']:'';
+        $data['noble_id']= isset($goon['noble_metal']) && $goon['noble_metal'] !='' ? array_search($goon['noble_metal'],\think\facade\Config::get("noble")):'';
         $info['wsm_name']="";
         $info['wsm_name']="";
         if($info['wsm_code']!=""){
         if($info['wsm_code']!=""){
             $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")
             $wsmcode = Db::name("warehouse_info")->alias("a")->leftJoin("supplier b","a.supplierNo=b.code")