wugg 6 months ago
parent
commit
84bd0fae7d
3 changed files with 24 additions and 25 deletions
  1. 2 21
      app/admin/model/GoodTax.php
  2. 20 3
      app/admin/model/GoodZixun.php
  3. 2 1
      config/console.php

+ 2 - 21
app/admin/model/GoodTax.php

@@ -41,25 +41,6 @@ class GoodTax extends Base
     //源头供应商税目
     public function cgdCategory(){
         return $this->hasOne(TaxCategory::class,'id','cgd_tax_id')
-        ->bind([
-            'in_tax'=>'tax',
-            'in_tax_short_name',
-            'in_tax_merge_code',
-            'in_tax_cat_code',
-            'in_tax_name',
-            'inv_good_name',
-            'out_tax',
-            'out_tax_short_name',
-            'out_tax_merge_code',
-            'out_tax_name',
-            'out_tax_cat_code',
-            'cgd_tax',
-            'cgd_tax_short_name',
-            'cgd_tax_merge_code',
-            'cgd_tax_name',
-            'cgd_tax_cat_code',
-            'addTax',
-            'sumitem'
-            ]);
-        }
+        ->bind(['cgd_tax_name'=>'cat_name','cgd_tax_short_name'=>'short_name','cgd_tax_merge_code'=>'merge_code','cgd_tax_cat_code'=>'cat_code','cgd_bind_tax'=>'tax']);
+    }
 }

+ 20 - 3
app/admin/model/GoodZixun.php

@@ -73,8 +73,25 @@ class GoodZixun extends Base
     }
     public function GoodTax(){
          return $this->hasOne('GoodTax','spuCode','spuCode')
-        ->bind(['cgd_inv_tax'=>'tax','cgd_inv_cat_name'=>'in_tax_short_name','cgd_inv_cat_code'=>'in_tax_merge_code',
-        'cgd_inv_good_name'=>'inv_good_name','inv_good_name','inv_tax'=>'out_tax','inv_cat_name'=>'out_tax_short_name',
-        'inv_cat_code'=>'out_tax_merge_code','addtax','sumitem']);
+        ->bind([
+                "in_tax"=>"tax",
+                "in_tax_short_name",
+                "in_tax_merge_code",
+                "in_tax_cat_code",
+                "in_tax_name",
+                "inv_good_name",
+                "out_tax",
+                "out_tax_short_name",
+                "out_tax_merge_code",
+                "out_tax_name",
+                "out_tax_cat_code",
+                "cgd_tax",
+                "cgd_tax_short_name",
+                "cgd_tax_merge_code",
+                "cgd_tax_name",
+                "cgd_tax_cat_code",
+                "addTax",
+                "sumitem"
+                ]);
     }
 }

+ 2 - 1
config/console.php

@@ -8,6 +8,7 @@ return [
     'commands' => [
     	"makemodel"=>\app\command\makeModel::class,
     	"sysgood"=>sysGood::class,
-    	"wxpush"=>\app\command\WxPush::class
+    	"wxpush"=>\app\command\WxPush::class,
+    	"goodcatcheck"=>\app\command\GoodCatCheck::class,
     ],
 ];