ad

app/admin/controller/Payment.php

@@ -990,11 +990,11 @@ class Payment extends Base
         $size =  isset($post['size'])&&$post['size']!="" ? intval($post['size']) :10;
         
         $list = CgdInfo::alias("a")
-                       ->leftJoin("pay_info b","a.sequenceNo=b.cgdNo and b.is_del=0 and b.status=1")
-                                   ->where($condition)
-                                   ->order("a.id","desc")
-	        ->field("a.*,b.payNo")
-                                   ->paginate (["list_rows"=>$size,"page"=>$page]);
+               ->leftJoin("pay_info b","a.sequenceNo=b.cgdNo and b.is_del=0 and b.status=1")
+               ->where($condition)
+               ->order("a.id","desc")
+               ->field("a.*,b.payNo")
+               ->paginate (["list_rows"=>$size,"page"=>$page]);
         //校验是否开通了供应商账号
         $supplierAr=array_unique(array_column($list->items(),'supplierNo'));
         $supp_account = check_has_account_by_supplierNos($supplierAr);
@@ -1948,6 +1948,7 @@ class Payment extends Base
         $supp_account = check_has_account_by_supplierNos(array_unique(array_column($list, 'supplierNo')));
         foreach ($list as &$value) {
             $value['has_account'] = (int)isset($supp_account['data'][$value['supplierNo']]);
+            $value['inv_number']= \app\admin\model\InvoiceInfo::where(["hpNo"=>$value['orderCode']])->value("number",'');
         }
 		return app_show(0,"获取成功",["list"=>$list,"count"=>$count]);
     }

app/admin/controller/Sale.php

@@ -6,7 +6,9 @@ namespace app\admin\controller;
 use app\admin\model\CgdInfo;use app\admin\model\InvoicePool;use app\admin\model\Pay;use app\admin\model\QrdInfo;use app\admin\model\TradePool;use think\App;
 use think\facade\Db;use think\facade\Validate;
 class Sale extends Base{
-    public function __construct(App $app) {parent::__construct($app);}
+    public function __construct(App $app) {
+        parent::__construct($app);
+    }
     /** 获取列表
     * @return \think\response\Json|void
     * @throws \think\db\exception\DataNotFoundException
@@ -145,7 +147,9 @@ class Sale extends Base{
         }
          $cat_status= isset($post['cat_status'])&&$post['cat_status']!=="" ? intval($post['cat_status']) :"";
          if($cat_status!=='') $condition[]=["b.status","=",$cat_status];
-        $count =Db::name("qrd_info")->alias("a")->leftJoin("good b","a.goodNo=b.spuCode")->where($condition)->count();
+        $count =Db::name("qrd_info")
+        ->alias("a")
+        ->leftJoin("good b","a.goodNo=b.spuCode")->where($condition)->count();
         $total = ceil($count/$size);
         $page = $page>$total ? intval($total) : $page;
         $list =Db::name("qrd_info")->alias("a")

app/command/good.php

@@ -44,6 +44,7 @@ class good extends Command
     	foreach ($data as $v){
 			$is=\app\admin\model\Good::where("spuCode",$v['spuCode'])->findOrEmpty();
 			if($is->isEmpty() || ($is->isZx==1 && $is->updatetime!=$v['updatetime'])){
+
 				$array=[
 					"id"=>$is->isEmpty()?null:$is->id,
 					"spuCode"=>$v['spuCode'],
@@ -85,14 +86,16 @@ class good extends Command
 	 */
     public function goodBasic(){
     	$list =Db::connect('mysql_wsm')
-            ->name('good_basic')
+            ->name('good_basic')->alias("a")
+            ->leftJoin("good_tax b","a.spuCode=b.spuCode")
             ->withAttr("cat_id",function ($v){
             	return Db::connect('mysql_wsm')->name('cat')->where("id",$v)->value("cat_name","");
             })
             ->withAttr("good_unit",function ($m){
             	return Db::connect('mysql_wsm')->name('unit')->where("id",$m)->value("unit","");
-            })->field("spuCode,good_name,cat_id,good_unit,craft_desc,after_sales,supplierNo,companyNo,supplierName,companyName,good_img,
-            good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild,addtime,updatetime")
+            })->field("a.spuCode,good_name,cat_id,good_unit,craft_desc,after_sales,supplierNo,companyNo,supplierName,companyName,good_img,
+            good_info_img,good_thumb_img,creater,createrid,is_stock,0 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild,addtime,updatetime
+            b.tax_id,b.tax,b.inv_good_name")
             ->where("updatetime",">=", $this->date)
             ->where("status","=", 1)
             ->select()->toArray();
@@ -102,14 +105,17 @@ class good extends Command
     public function goodZx(){
     	$list =Db::connect('mysql_wsm')
             ->name('good_zixun')
+            ->alias('a')
+            ->leftJoin('good_tax b','a.spuCode=b.spuCode')
             ->withAttr("cat_id",function ($v){
             	return Db::connect('mysql_wsm')->name('cat')->where("id",$v)->value("cat_name","");
             })
             ->withAttr("good_unit",function ($v){
             	return Db::connect('mysql_wsm')->name('unit')->where("id",$v)->value("unit","");
             })
-            ->field("spuCode,good_name,craft_desc,'' after_sales,cat_id,good_unit,supplierNo,companyNo,supplierName,companyName,good_img,
-            good_info_img,good_thumb_img,creater,createrid,0 is_stock,1 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild,addtime,updatetime")
+            ->field("a.spuCode,good_name,craft_desc,'' after_sales,cat_id,good_unit,supplierNo,a.companyNo,supplierName,companyName,good_img,
+            good_info_img,good_thumb_img,creater,createrid,0 is_stock,1 isZx,is_combind,cgd_supplier_code,cgd_supplier_name,isChild,
+            addtime,updatetime,b.tax_id,b.tax,b.inv_good_name")
             ->where("addtime",">=", $this->date)
             ->select()->toArray();
     	     return $this->addGood($list);
@@ -128,6 +134,6 @@ class good extends Command
     		}
     	    (new \app\admin\model\GoodCombind())->saveAll($add);
     	}
-    	
+
     }
 }

app/command/handleCxData.php

@@ -109,8 +109,9 @@ class handleCxData extends command
 									          'customerName'=>$data['customer_name'] ,//客户名称,
 									          'poCode'=>$data['poNo'] ,//po编号,
 									          "is_comon"=>ComonOrder::is_common($data['orderCode']),
-									          'platName'=>$data['platform_id'] ,//平台名称,
+									          'platName'=>$data['platform_name']??'',//平台名称,
 									          'platform_type' => $data['platform_type']??'0',//平台名称,
+									          'platform_id'=>$data['platform_id']??0,//平台id,'
 									          'workCode'=>$data['workNo'] ,//业务编号,
 									          'zxCode'=>$data['zxNo'] ,//咨询单编号,
 									          'goodNo'=>$data['good_code'] ,//商品编号,
@@ -194,6 +195,9 @@ class handleCxData extends command
 									          'goodDesc'=>$data['cost_desc'] ,//工艺说明,
 									          'goodType'=>$data['good_type'] ,//商品类型,
 									          'goodModel'=>'' ,//商品型号,
+									          'platName'=>$data['platform_name']??'',//平台名称,
+									          'platform_type' => $data['platform_type']??'0',//平台名称,
+									          'platform_id'=>$data['platform_id']??0,//平台id,'
 									          'companyNo'=>$data['supplierNo'] ,//业务企业编号,
 									          'companyName'=>$data['supplier_name'] ,//业务企业名称,
 									          'customerNo'=>$data['customer_code'] ,//客户编号,
@@ -240,8 +244,9 @@ class handleCxData extends command
 							    'customerNo'=>$data['customer_code'] ,//客户编号,
 							    'customerName'=>$data['customer_name'] ,//客户名称,
 							    'poCode'=>$data['poNo'] ,//po编号,
-							    'platName'=>$data['platform_id'] ,//平台名称,
+							    'platName'=>$data['platform_name']??'',//平台名称,
 							    'platform_type' => $data['platform_type']??'0',//平台名称,
+							    'platform_id'=>$data['platform_id']??0,//平台id,'
 							    'workCode'=>$data['workNo'] ,//业务编号,
 							    'zxCode'=>$data['zxNo'] ,//咨询单编号,
 							    'goodNo'=>$data['good_code'] ,//商品编号,
@@ -349,6 +354,8 @@ class handleCxData extends command
 									      'cgdSource'=>$data['order_source'] ,//采购单来源',
 									      'companyNo'=>$data['companyNo'] ,//业务公司编号',
 									      'companyName'=>$data['companyName'] ,//业务公司',
+									      'platform_name'=>$data['platform_name']??'',//平台名称,
+									      'platform_id'=>$data['platform_id']??0,//平台id,'
 									       'is_comon'=>isset($data['mainCode'])?2: ComonOrder::is_common($data['cgdNo']),
 									      'cgdTime'=>$data['addtime'] ,//采购下单时间',
 									      'bkCode'=>$data['bkcode'] ,//备库单编号',
@@ -447,6 +454,8 @@ class handleCxData extends command
 									      'goodDesc'=>$data['cost_desc'] ,//工艺说明',
 									      'metalsType'=>$data['noble_metal'] ,//贵金属种类',
 									      'weight'=>$data['weight'] ,//商品重量',
+									      'platform_name'=>$data['platform_name']??'',//平台名称,
+									      'platform_id'=>$data['platform_id']??0,//平台id,'
 									      'is_diff'=>$data['is_diff'] ,//是否有工差',
 									      'deliveryDay'=>$data['delivery_day'] ,//物流天数',
 									      'workDay'=>$data['lead_time'] ,//产品工期',
@@ -503,6 +512,8 @@ class handleCxData extends command
 							    'goodType'=>$data['good_type'] ,//商品类型',
 							    'goodBrand'=>$data['brand'] ,//商品品牌',
 							    'goodModel'=>'' ,//商品型号',
+							    'platform_name'=>$data['platform_name']??'',//平台名称,
+								'platform_id'=>$data['platform_id']??0,//平台id,'
 							     'is_comon'=>isset($data['mainCode'])?2: ComonOrder::is_common($data['cgdNo']),
 							    'firstCat'=>$data['cat_name'][0]['cat_name'] ?? "" ,//商品一级分类',
 							    'secCat'=>!isset($data['cat_name'][1]) ? '' : $data['cat_name'][1]['cat_name'] ,//二级分类,