Merge branch 'dev-wgg' of wugg/cxinv into dev

app/admin/controller/Good.php

@@ -73,14 +73,14 @@ class Good extends Base
             $tax= $item['tax'];
         	$item['tax'] = bcdiv(str_replace('%', '', $item['tax']), "100", 2);
         	if($param['status']==1){
-        		if($good->cgd_to_pay)$this->error("商品{$item['spuCode']}已参与采购付款回票对账");
+//        		if($good->cgd_to_pay)$this->error("商品{$item['spuCode']}已参与采购付款回票对账");
         	    $temp["cgd_inv_cat_code"]=$catArr[$item['cat_code']]['merge_code'];
         	    $temp["cgd_inv_cat_name"]=$catArr[$item['cat_code']]['short_name'];
         	    $temp["cgd_inv_good_name"]= $item['inv_good_name'];
         	    $temp["cgd_inv_tax"]= $item['tax'];
         	}
         	if($param['status']==2){
-        	    if($good->qrd_to_pay)$this->error("商品{$item['spuCode']}已参与销售回款开票结算");
+//        	    if($good->qrd_to_pay)$this->error("商品{$item['spuCode']}已参与销售回款开票结算");
         	    $check = CheckTax($item['is_discount'],$item['tax'],$item['inv_tag'],$item['addTax'],$message);
         	    if($check==false)$this->error("商品{$item['spuCode']}{$message}");
         	    $temp['inv_cat_code']=$catArr[$item['cat_code']]['merge_code'];

app/admin/controller/InvCat.php

@@ -161,7 +161,7 @@ class InvCat extends Base{
        $condition =[["tax","<>",""]];
         $cat_name = isset($this->post['cat_name'])&&$this->post['cat_name']!=''?trim($this->post['cat_name']):"";
         if($cat_name!=''){
-            $condition[]=["cat_name","like","%$cat_name%"];
+            $condition[]=["cat_name|short_name","like","%$cat_name%"];
         }
         $cat_code = isset($this->post['cat_code'])&&$this->post['cat_code']!=''?trim($this->post['cat_code']):"";
         if($cat_code!=''){

app/admin/controller/WeChat.php

@@ -10,8 +10,8 @@ class WeChat extends Base {
 	public $wechat;
 	public function __construct(App $App) {
 		parent::__construct($App);
-		$wechat_conf=["appid"=>env("WECHAT.APPID"),"appsecret"=>env("WECHAT.APPSECRET")];
-		$this->wechat=new \Wechat($wechat_conf);
+//		$wechat_conf=["appid"=>env("WECHAT.APPID"),"appsecret"=>env("WECHAT.APPSECRET")];
+//		$this->wechat=new \Wechat($wechat_conf);
 	}
 //		获取用户信息{subscribe,openid,nickname,sex,city,province,country,language,headimgurl,subscribe_time,[unionid]}
 

app/command/handleCxData.php

@@ -400,6 +400,11 @@ class handleCxData extends command
 									      'is_del'=>0 ,
 									      'addtime'=>$date ,
 									      'updatetime'=>$date ,
+								        'supplier_origin_price'=>$data['supplier_origin_price'],//供应商采购成本
+								        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+								        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+								        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+								        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
 								      ]
 							      );
 
@@ -451,6 +456,11 @@ class handleCxData extends command
 									      'cxCode'=>$data['oldCode'] ?? '' ,//备注,
 									      'check_rate'=>'' ,//修正后的税率',
 									      'updatetime'=>$date ,
+									      'supplier_origin_price'=>$data['supplier_origin_price'],//供应商采购成本
+								        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+								        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+								        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+								        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
 								      ]
 							      );
 						    }
@@ -529,6 +539,11 @@ class handleCxData extends command
 							    'is_del'=>0 ,
 							    'addtime'=>$date ,
 							    'updatetime'=>$date ,
+					            'supplier_origin_price'=>$data['supplier_origin_price'],//供应商采购成本
+						        'cgd_supplier_code'=>$data['cgd_supplier_code'],//采购供应商编号
+						        'cgd_supplier_name'=>$data['cgd_supplier_name'],//采购供应商编号
+						        'cgd_apply_id'=>$data['cgd_apply_id'],//竞单人
+						        'cgd_apply_name'=>$data['cgd_apply_name'],//竞单人
 						    ];
 					    }