ad

app/admin/model/Good.php

@@ -80,6 +80,5 @@ class Good extends Base
         'cgd_apply_id'       =>'int',//竞单人
         'cgd_apply_name'       =>'varchar',//竞单人
         'isChild'       =>'tinyint',//是否子商品
-
     ];
 }

app/admin/model/GoodBasic.php

@@ -82,6 +82,19 @@ class GoodBasic extends Base
         'cgd_apply_id'       =>'int',//竞单人
         'cgd_apply_name'       =>'varchar',//竞单人
         'isChild'       =>'tinyint',//是否子商品
-
     ];
+    public function Unit(){
+        return $this->hasOne('Unit','good_unit','id')->bind(["unit_name"]);
+    }
+    public function Cat(){
+        return $this->hasOne('Cat','cat_id','id')->bind(["cat_name"]);
+    }
+
+    public function Brand(){
+        return $this->hasOne('Brand','brand_id','id')->bind(["brand_name"]);
+    }
+
+    public function GoodTax(){
+        return $this->hasOne('GoodTax',"spuCode",'spuCode')->bind(["cgd_inv_tax"=>"tax","tax_id","cgd_inv_good_name"=>"inv_good_name"]);
+    }
 }

app/admin/model/GoodTax.php

@@ -0,0 +1,26 @@
+<?php
+namespace app\admin\model;
+
+use think\model\concern\SoftDelete;
+class GoodTax extends Base
+{
+    use SoftDelete;
+//设置字段信息
+    protected $schema = [
+        'id'  =>'bigint',//
+        'spuCode'  =>'varchar',//
+        'tax_id'  =>'int',//进销项类目id
+        'tax'  =>'varchar',//进项税率
+        'companyNo'  =>'varchar',//业务公司
+        'open_type'  =>'tinyint',//开票类型
+        'inv_good_name'  =>'varchar',//开票商品名称
+        'createrid'  =>'int',//
+        'creater'  =>'varchar',//
+        'createTime'  =>'datetime',//
+        'updateTime'  =>'datetime',//
+        'delete_time'  =>'datetime',//
+       ];
+    protected $createTime='createTime';
+    protected $updateTime='updateTime';
+    protected $deleteTime='delete_time';
+}

app/admin/model/GoodZixun.php

@@ -60,6 +60,18 @@ class GoodZixun extends Base
         'order_type'       =>'tinyint',//商品类型
         'order_createrid'       =>'int',//订单创建人
         'order_creater'       =>'varchar',//订单创建人
-
     ];
+
+    public function Brand(){
+        return $this->hasOne('Brand','brand_id','id')->bind(["brand_name"]);
+    }
+    public function Cat(){
+        return $this->hasOne('Cat','cat_id','id')->bind(["cat_name"]);
+    }
+    public function Unit(){
+        return $this->hasOne('Unit','good_unit','id')->bind(["unit_name"]);
+    }
+    public function GoodTax(){
+        return $this->hasOne('GoodTax',"spuCode",'spuCode')->bind(["cgd_inv_tax"=>"tax","tax_id","cgd_inv_good_name"=>"inv_good_name"]);
+    }
 }

app/command/makeModel.php

@@ -17,9 +17,9 @@ class makeModel extends Command
         $this->setName('makemodel')
             ->setDescription('the makemodel command');
     }
-	static $schema = 'sys_user_pre_release';
-	static $prefix = 'Sys';
-	static $epp = 'user';
+	static $schema = 'wsm3_pre_release';
+	static $prefix = 'Wsm';
+	static $epp = 'admin';
     protected function execute(Input $input, Output $output)
     {
 

app/user/controller/TaxCategory.php

@@ -52,8 +52,8 @@ class TaxCategory extends Base{
         if($params["short_name"]!='') $where[]=["short_name","like","%".$params["short_name"]."%"];
         if($params["income_status"]!=='') $where[]=$params['income_status']==0 ? ['income','=',null] :['income','=',$params['income_status']];
         if($params["output_status"]!=='') $where[]=$params['output_status']==0 ? ['output','=',null] :['output','=',$params['output_status']];
-        if($params['in_status']!='') $params['in_status']==0 ? ['in_status','=',null] :['in_status','=',$params['in_status']];
-        if($params['out_status']!='') $params['out_status']==0 ? ['out_status','=',null] :['out_status','=',$params['out_status']];
+        if($params['in_status']!='') $where[]=$params['in_status']==0 ? ['in_status','=',null] :['in_status','=',$params['in_status']];
+        if($params['out_status']!='') $where[]=$params['out_status']==0 ? ['out_status','=',null] :['out_status','=',$params['out_status']];
         if($params["cat_code"]!='') $where[]=["cat_code|merge_code","like","%".$params["cat_code"]."%"];
         if($params["companyNo"]!='') $where[]=["business.companyNo","=",$params["companyNo"]];
         $list=$this->model->alias("tax_category")

config/console.php

@@ -2,10 +2,11 @@
 // +----------------------------------------------------------------------
 // | 控制台配置
 // +----------------------------------------------------------------------
+use app\command\sysGood;
 return [
     // 指令定义
     'commands' => [
     	"makemodel"=>\app\command\makeModel::class,
-
+    	"sysgood"=>sysGood::class,
     ],
 ];

config/database.php

@@ -175,7 +175,7 @@ return [
                     'fields_cache'    => false,
                 ],
                 
-                 //有赞数据库
+                 //工单数据
        'mysql_bug' => [
                     // 数据库类型
                     'type'            => env('mysql_bug.type', 'mysql'),