Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -45,8 +45,8 @@ class Report extends Base
             ->alias('gl')
             ->field('g.good_name 商品名称,gl.market_price 市场价,g.tax 税率,gl.min_num 起订量,gl.sale_price 售价,gl.skuCode 商品编码,gl.cost_fee 工艺费,gl.market_platform 对比平台')
             ->where($where_ladder)
-            ->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode AND gp.is_del=0')
-            ->leftJoin('good g', 'g.spuCode=gp.spuCode AND g.is_del=0')
+            ->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode')
+            ->leftJoin('good g', 'g.spuCode=gp.spuCode')
             ->order('gl.id')
             ->select()
             ->toArray();
@@ -64,7 +64,7 @@ class Report extends Base
             ->alias('g')
             ->field('"" 一级分类,"" 二级分类, g.cat_id 三级分类,g.good_name 商品名称,g.good_type 商品类型,g.brand_id 商品品牌,\'\' 型号,g.origin_place 产地,g.good_unit 计量单位,g.weight 重量g,\'\' 响应时间,g.lead_time 供货周期,g.good_size 商品尺寸,g.packing_size 装箱尺寸,g.packing_way 包装方式,g.packing_spec 装箱规格,g.packing_list 包装清单,g.delivery_place 发货地,g.delivery_day 物流时间,gp.skuCode 商品编码,g.spuCode')
             ->where($where_good)
-            ->leftJoin('good_platform gp', 'gp.spuCode=g.spuCode AND gp.is_del=0')
+            ->leftJoin('good_platform gp', 'gp.spuCode=g.spuCode')
             ->order('g.id')
             ->select()
             ->toArray();
@@ -75,8 +75,8 @@ class Report extends Base
             ->alias('c3')
             ->whereIn('c3.id', array_column($rs_temp_good, '三级分类'))
             ->where('c3.is_del', 0)
-            ->leftJoin('cat c2', 'c2.id=c3.pid AND c2.is_del=0')
-            ->leftJoin('cat c1', 'c1.id=c2.pid AND c1.is_del=0')
+            ->leftJoin('cat c2', 'c2.id=c3.pid')
+            ->leftJoin('cat c1', 'c1.id=c2.pid')
             ->column('c3.cat_name cat_name_3,c2.cat_name cat_name_2,c1.cat_name cat_name_1', 'c3.id');
 
         $all_unit = Db::name('unit')->whereIn('id', array_column($rs_temp_good, '计量单位'))->where('is_del', 0)->column('unit', 'id');
@@ -97,8 +97,8 @@ class Report extends Base
             $value['型号'] = Db::name('good_spec')
                 ->alias('gp')
                 ->field('')
-                ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
-                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                ->leftJoin('specs s', 's.id=gp.spec_id')
+                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id')
                 ->where([
                     'gp.spuCode' => $value['spuCode'],
                     'gp.is_del' => 0,
@@ -109,8 +109,8 @@ class Report extends Base
             $value['响应时间'] = Db::name('good_spec')
                 ->alias('gp')
                 ->field('')
-                ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
-                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                ->leftJoin('specs s', 's.id=gp.spec_id')
+                ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id')
                 ->where([
                     'gp.spuCode' => $value['spuCode'],
                     'gp.is_del' => 0,
@@ -166,8 +166,8 @@ class Report extends Base
         $count = Db::name('consult_order')
             ->alias('co')
             ->field('DATE_FORMAT(co.addtime,"%Y-%m-%d") addtime,cii.name,count(ci.id) total')
-            ->leftJoin('consult_info ci', 'ci.zxNo=co.zxNo AND ci.is_del=0 AND ci.bargain_code!="" ')
-            ->leftJoin('company_item cii', 'cii.id=co.depart AND cii.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.zxNo=co.zxNo AND ci.bargain_code!="" ')
+            ->leftJoin('company_item cii', 'cii.id=co.depart')
             ->where($where)
             ->group('addtime,co.depart')
             ->count();
@@ -175,8 +175,8 @@ class Report extends Base
         $list = Db::name('consult_order')
             ->alias('co')
             ->field('DATE_FORMAT(co.addtime,"%Y-%m-%d") addtime,cii.name,count(ci.id) total')
-            ->leftJoin('consult_info ci', 'ci.zxNo=co.zxNo AND ci.is_del=0 AND ci.bargain_code!="" ')
-            ->leftJoin('company_item cii', 'cii.id=co.depart AND cii.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.zxNo=co.zxNo AND ci.bargain_code!="" ')
+            ->leftJoin('company_item cii', 'cii.id=co.depart')
             ->where($where)
             ->group('addtime,co.depart')
             ->order('addtime')
@@ -213,8 +213,8 @@ class Report extends Base
         //统计条数的时候，不能按照status分组，否则下方列表不准
         $count = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=du.itemid AND ci.is_del=0')
+            ->leftJoin('depart_user du', 'du.uid=po.cgder_id')
+            ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->order('addtime,itemid')
             ->field('DATE_FORMAT(po.addtime,"%Y-%m-%d") addtime,SUM(po.total_fee) total_fee,COUNT(po.id) total_num,du.itemid,ci.name,"" wait_total_fee,"" wait_total_num')
@@ -223,8 +223,8 @@ class Report extends Base
 
         $list = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('depart_user du', 'du.uid=po.cgder_id AND du.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=du.itemid AND ci.is_del=0')
+            ->leftJoin('depart_user du', 'du.uid=po.cgder_id')
+            ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->order('addtime,itemid')
             ->field('DATE_FORMAT(po.addtime,"%Y-%m-%d") addtime,SUM(po.total_fee) total_fee,COUNT(po.id) total_num,po.status,du.itemid,ci.name,"" wait_total_fee,"" wait_total_num')
@@ -293,9 +293,9 @@ class Report extends Base
         $count = Db::name('consult_bids')
             ->alias('cb')
             ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,du.nickname,ci.name')
-            ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo AND c.is_del=0')
-            ->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=du.itemid AND ci.is_del=0')
+            ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo')
+            ->leftJoin('depart_user du', 'du.uid=cb.createrid')
+            ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->group('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
             ->order('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
@@ -304,9 +304,9 @@ class Report extends Base
         $list = Db::name('consult_bids')
             ->alias('cb')
             ->field('DATE_FORMAT(cb.addtime,"%Y-%m-%d") addtime,du.itemid,cb.createrid,SUM(c.num) num,COUNT(cb.id) total,du.nickname,ci.name')
-            ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo AND c.is_del=0')
-            ->leftJoin('depart_user du', 'du.uid=cb.createrid AND du.is_del=0')
-            ->leftJoin('company_item ci', 'ci.id=du.itemid AND ci.is_del=0')
+            ->leftJoin('consult_info c', 'c.zxNo=cb.zxNo')
+            ->leftJoin('depart_user du', 'du.uid=cb.createrid')
+            ->leftJoin('company_item ci', 'ci.id=du.itemid')
             ->where($where)
             ->group('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
             ->order('addtime,du.itemid,ci.name ,cb.createrid,du.nickname')
@@ -421,20 +421,20 @@ class Report extends Base
 
         $count = Db::name('consult_bids')
             ->alias('cb')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('supplier s', 's.code=cb.supplierNo AND s.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('supplier s', 's.code=cb.supplierNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->where($where)
             ->count('cb.id');
 
         $data = Db::name('consult_bids')
             ->alias('cb')
             ->field('cb.id,ci.addtime,cb.bidNo,cb.zxNo,cb.addtime cbaddtime,cb.good_name,s.name supplier,cb.total_fee,cb.delivery_day,cb.work_day,cb.expire_day,cb.creater,ci.num,ci.arrival_time,co.salesman,csi.companyName')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('supplier s', 's.code=cb.supplierNo AND s.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('supplier s', 's.code=cb.supplierNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->where($where)
             ->page($param['page'], $param['size'])
             ->order('ci.addtime', 'desc')
@@ -495,10 +495,10 @@ class Report extends Base
 
         $data = $rs
             ->field('ci.addtime as 咨询时间,cb.bidNo as 采购单反馈单号,cb.zxNo as 咨询订单号,cb.addtime as 回复时间,cb.good_name as 产品名称,s.name as 供应商名称,cb.total_fee 成本合计,cb.delivery_day 物流时间,cb.work_day 产品工期,cb.expire_day 信息有效期,cb.creater 采购员,ci.num 需求数量,ci.arrival_time 要求到货日期,co.salesman 业务人员,csi.companyName 客户名称')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('supplier s', 's.code=cb.supplierNo AND s.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('supplier s', 's.code=cb.supplierNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->select()
             ->toArray();
 
@@ -536,9 +536,9 @@ class Report extends Base
 
         $count = Db::name('consult_bids')
             ->alias('cb')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->where($where)
             ->order('co.endtime', 'desc')
             ->count('cb.id');
@@ -546,9 +546,9 @@ class Report extends Base
         $data = Db::name('consult_bids')
             ->alias('cb')
             ->field('cb.zxNo,cb.good_name,ci.num,csi.companyName,ci.addtime,co.endtime')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->where($where)
             ->order('co.endtime', 'desc')
             ->page($param['page'], $param['size'])
@@ -579,9 +579,9 @@ class Report extends Base
 
         $rs = Db::name('consult_bids')
             ->alias('cb')
-            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo AND ci.is_del=0')
-            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo AND co.is_del=0')
-            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo AND csi.is_del=0')
+            ->leftJoin('consult_info ci', 'ci.infoNo=cb.infoNo')
+            ->leftJoin('consult_order co', 'co.zxNo=cb.zxNo')
+            ->leftJoin('customer_info csi', 'csi.companyNo=co.khNo')
             ->where('cb.is_del', 0)
             ->order('co.endtime', 'desc');
 
@@ -631,14 +631,14 @@ class Report extends Base
 
         $count = Db::name('purchease_order')
             ->alias('po')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo AND b.is_del=0')
+            ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->where($where)
             ->count('po.id');
 
         $data = Db::name('purchease_order')
             ->alias('po')
             ->field('po.cgdNo,po.addtime,po.supplierNo,po.supplier_name,po.good_name,po.good_num,po.nake_fee,po.total_fee,po.status,po.send_status,po.wsend_num,"" creater,b.company,po.cgder,"" send_time,on.orderCode,po.order_type,po.bkcode,po.spuCode')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo AND b.is_del=0')
+            ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->where($where)
             ->page($param['page'], $param['size'])
@@ -699,7 +699,7 @@ class Report extends Base
         $data = Db::name('purchease_order')
             ->alias('po')
             ->field('po.cgdNo 采购单编号,po.addtime 创建时间,po.supplierNo 供应商编号,po.supplier_name 供应商名称,po.good_name 产品名称,po.good_num 购买数量,po.nake_fee 裸价,po.total_fee 成本合计,po.status 单据状态,po.send_status 发货状态,po.wsend_num 未发货数量,"" 创建人,b.company 客户名称,po.cgder 采购员,"" 发货时间,on.orderCode,po.order_type,po.bkcode,po.spuCode')
-            ->leftJoin('business b', 'b.companyNo=po.companyNo AND b.is_del=0')
+            ->leftJoin('business b', 'b.companyNo=po.companyNo')
             ->leftJoin('order_num on', 'on.cgdNo=po.cgdNo')
             ->where($where)
             ->order('po.addtime', 'desc')
@@ -767,7 +767,7 @@ class Report extends Base
         $count = Db::name('order_return')
             ->alias('or')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
             ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->where($where)
@@ -777,7 +777,7 @@ class Report extends Base
             ->alias('or')
             ->field('or.id,or.returnCode,or.addtime,on.cgdNo,po.supplierNo,po.supplier_name,or.good_name,or.total_num, oo.updatetime receipttime ,or.error_num,or.error_remark,ri.result error_reason,or.status')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
             ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->where($where)
@@ -817,7 +817,7 @@ class Report extends Base
             ->alias('or')
             ->field('or.returnCode 售后单编号,or.addtime 创建时间,on.cgdNo 采购单编号,po.supplier_name 供应商名称,or.good_name 产品名称,or.total_num 购买数量, oo.updatetime 签收日期,or.error_num 售后数量,or.error_remark 问题描述,ri.result 异常原因,or.status 售后状态')
             ->leftJoin('order_num on', 'on.orderCode=or.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
             ->leftJoin('order_out oo', 'oo.outCode=or.outCode AND oo.status=3')
             ->leftJoin('result_info ri', 'ri.result_code=or.error_code')
             ->where($where)
@@ -941,8 +941,8 @@ class Report extends Base
             ->alias('s')
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
             ->count('s.id');
 
         $list = Db::name('sale_return')
@@ -950,8 +950,8 @@ class Report extends Base
             ->field('s.returnCode,s.addtime,po.cgdNo,po.supplier_name,po.good_name,po.good_num,po.cgder,s.num,on.send_num,ri.result,s.is_th')
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
             ->page($param['page'], $param['size'])
             ->select()
             ->toArray();
@@ -985,8 +985,8 @@ class Report extends Base
             ->field('s.returnCode 退货单号,s.addtime 退货时间,po.cgdNo 采购单编号,po.supplier_name 供应商名称,po.good_name 产品名称,po.good_num 购买数量,po.cgder 采购员,s.num 退货数量,on.send_num 已发货数量,ri.result 退货原因,s.is_th 供应商是否可以退货')
             ->where($where)
             ->leftJoin('order_num on', 'on.orderCode=s.orderCode')
-            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo AND po.is_del=0')
-            ->leftJoin('result_info ri', 'ri.result_code=s.error_code AND ri.is_del=0')
+            ->leftJoin('purchease_order po', 'po.cgdNo=on.cgdNo')
+            ->leftJoin('result_info ri', 'ri.result_code=s.error_code')
             ->withAttr('供应商是否可以退货', function ($val) use ($all_is_th) {
                 return isset($all_is_th[$val]) ? $all_is_th[$val] : '';
             })
@@ -1029,24 +1029,24 @@ class Report extends Base
         $count = Db::name('good_platform')
             ->alias('gp')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('brand b', 'b.id=gb.brand_id AND b.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('brand b', 'b.id=gb.brand_id')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->count('gp.id');
 
         $list = Db::name('good_platform')
             ->alias('gp')
             ->field('gb.creater,gp.skuCode,gp.spuCode,gb.good_name,b.brand_name,"" good_model,s.name,gb.tax,gb.nake_price,gp.online_time')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('brand b', 'b.id=gb.brand_id AND b.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('brand b', 'b.id=gb.brand_id')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->withAttr('good_model', function ($val, $data) {
                 return Db::name('good_spec')
                     ->alias('gp')
                     ->field('')
-                    ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
-                    ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                    ->leftJoin('specs s', 's.id=gp.spec_id')
+                    ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id')
                     ->where([
                         'gp.spuCode' => $data['spuCode'],
                         'gp.is_del' => 0,
@@ -1089,15 +1089,15 @@ class Report extends Base
             ->alias('gp')
             ->field('gb.creater 采购维护人,gp.skuCode 商品上线编号,gp.spuCode 商品成本编号,gb.good_name 商品名称,b.brand_name 品牌名称,"" 商品型号,s.name 供应商名称,gb.tax 税点,gb.nake_price 成本价合计,gp.online_time 上线时间')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('brand b', 'b.id=gb.brand_id AND b.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('brand b', 'b.id=gb.brand_id')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->withAttr('商品型号', function ($val, $data) {
                 return Db::name('good_spec')
                     ->alias('gp')
                     ->field('')
-                    ->leftJoin('specs s', 's.id=gp.spec_id AND s.is_del=0')
-                    ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id AND s.is_del=0')
+                    ->leftJoin('specs s', 's.id=gp.spec_id')
+                    ->leftJoin('spec_value sv', 'sv.id=gp.spec_value_id')
                     ->where([
                         'gp.spuCode' => $data['商品成本编号'],
                         'gp.is_del' => 0,
@@ -1143,16 +1143,16 @@ class Report extends Base
         $count = Db::name('good_platform')
             ->alias('gp')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->count('gp.id');
 
         $list = Db::name('good_platform')
             ->alias('gp')
             ->field('gp.updatetime,gb.creater,gp.skuCode,gp.spuCode,gb.good_name,s.name')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->page($param['page'], $param['size'])
             ->select()
             ->toArray();
@@ -1188,8 +1188,8 @@ class Report extends Base
             ->alias('gp')
             ->field('gp.updatetime 商品下线时间,gb.creater 采购维护人,gp.skuCode 商品上线编号,gp.spuCode 商品成本编号,gb.good_name 商品名称,s.name 供应商名称')
             ->where($where)
-            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=gp.spuCode')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->select()
             ->toArray();
 
@@ -1227,16 +1227,16 @@ class Report extends Base
 
         $count = Db::name('change_log')
             ->alias('cl')
-            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->where($where)
             ->count('cl.id');
 
         $data = Db::name('change_log')
             ->alias('cl')
             ->field('cl.addtime,gb.creater,cl.code,gb.good_name,s.name,cl.before_info,cl.after_info')
-            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->where($where)
             ->order('cl.addtime', 'desc')
             ->page($param['page'], $param['size'])
@@ -1400,8 +1400,8 @@ class Report extends Base
         $data = Db::name('change_log')
             ->alias('cl')
             ->field('cl.addtime 商品操作时间,gb.creater 采购维护人,cl.code 商品成本编号,gb.good_name 商品名称,s.name 供应商名称,cl.before_info 修改前的内容,cl.after_info 修改后的内容')
-            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code AND gb.is_del=0')
-            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+            ->leftJoin('good_basic gb', 'gb.spuCode=cl.code')
+            ->leftJoin('supplier s', 's.code=gb.supplierNo')
             ->where($where)
             ->cursor();
 
@@ -1484,11 +1484,11 @@ class Report extends Base
          * ->alias('gl')
          * ->field('"" 创建人,"" 创建人公司,"" 创建人部门,"" 创建时间,"" 单据状态,"" 采购单号,gl.type 出入库类型,gb.good_name 商品名称,gb.spuCode 产品编码,gl.stock 出入库数量,gl.addtime 出入库日期,"" 维护人员,"" 发起人,wi.wsm_type 库房性质,s.name 库房公司,wi.name 库房名称')
          * //            ->where($where)
-         * ->leftJoin('good_stock gs', 'gs.id=gl.stock_id AND gs.is_del=0')
-         * ->leftJoin('good_basic gb', 'gb.spuCode=gs.spuCode AND gb.is_del=0')
-         * ->leftJoin('warehouse_info wi', 'wi.wsm_code=gs.wsm_code AND wi.is_del=0')
-         * ->leftJoin('supplier s', 's.code=wi.supplierNo AND s.is_del=0')
-         * //            ->leftJoin('supplier s', 's.code=gb.supplierNo AND s.is_del=0')
+         * ->leftJoin('good_stock gs', 'gs.id=gl.stock_id')
+         * ->leftJoin('good_basic gb', 'gb.spuCode=gs.spuCode')
+         * ->leftJoin('warehouse_info wi', 'wi.wsm_code=gs.wsm_code')
+         * ->leftJoin('supplier s', 's.code=wi.supplierNo')
+         * //            ->leftJoin('supplier s', 's.code=gb.supplierNo')
          * ->select()
          * ->toArray();
          * halt($list);
@@ -1521,10 +1521,10 @@ class Report extends Base
         $data = Db::name('sale_return')
             ->alias('sr')
             ->field('sr.returnCode 退货单号,sr.status 流程进度,sr.addtime 退货发起日期,s.supplierNo 公司名称,sr.apply_name 退货人,sr.num 退货数量,sr.total_fee 退货销售货款,sr.remark 退货备注,c.companyName 客户名称,or.customer_code 客户编码,"" 一级组织,"" 二级组织,"" 三级组织,p.platform_name 平台类型,s.poNo PO编号,sr.orderCode 确认单编号,s.order_type 确认单类型,s.addtime 确认单下单时间,s.apply_name 业务人员,sr.orderCode 确认单产品编号,sr.good_name 产品名称,sr.good_code 产品编码,s.cat_id,c.itemid')
-            ->leftJoin('platform p', 'p.id = sr.platform_id AND p.is_del = 0')
-            ->leftJoin('order_return or', 'or.orderCode = sr.orderCode AND or.is_del = 0')
-            ->leftJoin('customer_info c', 'c.companyNo = or.customer_code AND c.is_del = 0')
-            ->leftJoin('sale s', 's.orderCode = sr.orderCode AND s.is_del = 0')
+            ->leftJoin('platform p', 'p.id = sr.platform_id')
+            ->leftJoin('order_return or', 'or.orderCode = sr.orderCode')
+            ->leftJoin('customer_info c', 'c.companyNo = or.customer_code')
+            ->leftJoin('sale s', 's.orderCode = sr.orderCode')
             ->where($where)
             ->cursor();