d

app/admin/controller/Export.php

@@ -847,11 +847,11 @@ class Export extends BaseController
 		]);
 		if($valid->check($param)==false) return error_show(1005,$valid->getError());
 		$Db= Db::connect("mysql_wsm");
-		$list =$Db->name("th_data")
+		$list =$Db->name("th_data")->alias("a")
 		->leftjoin("sale b","a.orderCode=b.orderCode")
-		->field("a.thCode 退货单号,a.orderCode 销售单号,b.apply_name 业务人员,b.apply_id 业务部门,a.cat_id 分类,b.total_price 产品货款总额,a.th_fee,a.addtime 日期")
-		->where(["is_del"=>0,"status"=>[0,1,2]])
-		->whereBetween("addtime",[date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
+		->field("a.thCode 退货单号,a.orderCode 销售单号,b.apply_name 业务人员,b.apply_id 业务部门,a.cat_id 分类,b.total_price 产品货款总额,a.th_fee 退货金额,a.addtime 日期")
+		->where(["a.is_del"=>0])
+		->whereBetween("a.addtime",[date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
 		strtotime($param['end']))])
 		->cursor();
 		foreach ($list as $value){

app/command/Report.php

@@ -99,6 +99,10 @@ class Report extends Command
             case 'N':
                 $method="N";
                 $file='退货台账';
+                break;
+            case 'Q':
+                $method="Q";
+                $file='产品部门销售业绩';
                 break;
 			default:
 				$file='暂无数据';
@@ -145,19 +149,6 @@ class Report extends Command
 
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
 		if (($param['companyNo'] != '') && ($param['companyNo'] != '')) $where[] = ["a.inv_out","=",$param['companyNo']];
-
-//		if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
-//		if ($param['inv_type'] != '') $where[] = ['a.inv_type', '=', $param['inv_type']];
-//		if ($param['inv_out'] != '') $where[] = ['a.inv_out', '=', $param['inv_out']];
-//		if ($param['invNo'] != '') $where[] = ['a.invNo', 'in', $param['invNo']];
-//		if ($param['relaComNo'] != '') $where[] = ['a.inv_out', '=', $param['relaComNo']];
-//		if ($param['inv_number'] != '') $where[] = ['c.inv_number', 'like', '%' . $param['inv_number'] . '%'];
-//		if ($param['inv_code'] != '') $where[] = ['c.inv_code', 'like', '%' . $param['inv_code'] . '%'];
-//		if ($param['inv_company'] != '') $where[] = ['a.inv_company', 'like', '%' . $param['inv_company'] . '%'];
-//		if ($param['buyer_name'] != '') $where[] = ['b.buyer_title', 'like', '%' . $param['buyer_name'] . '%'];
-//		if ($param['apply_id'] != '') $where[] = ['a.apply_id', '=', $param['apply_id']];
-//		if ($param['apply_name'] != '') $where[] = ['a.apply_name', 'like', '%' . $param['apply_name'] . '%'];
-
 		$open_type = [1 => '金税开票', 2 => '金税线下', 3 => '纯线下'];//开票方式
 		$inv_type = config('invoiceType.invoiceName');//开票种类(发票类型)
 
@@ -212,21 +203,6 @@ class Report extends Command
 //		$param = $this->request->only(['start' => '', 'end' => '', 'invType' => '', 'company' => '', 'relaComNo' => '', 'supplierNo' => '', 'hpNo' => '', 'payNo' => '', 'invoiceType' => '', 'status' => '', 'invoiceNumber' => '', 'checkApi' => '', 'invoiceCode' => '', 'open_start' => '', 'open_end' => '', 'apply_id' => '', 'apply_name' => ''], 'post', 'trim');
 
 		$where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
-//		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
-//		if ($param['invType'] != '') $where[] = ['a.invType', '=', $param['invType']];
-//		if ($param['company'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['company'] . '%'];
-//		if ($param['relaComNo'] != '') $where[] = ['b.companyNo|b.supplierNo', 'like', '%' . $param['relaComNo'] . '%'];
-//		if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', '=', $param['supplierNo']];
-//		if ($param['hpNo'] != '') $where[] = ['a.hpNo', 'like', '%' . $param['hpNo'] . '%'];
-//		if ($param['payNo'] != '') $where[] = ['a.payNo', 'like', '%' . $param['payNo'] . '%'];
-//		if ($param['invoiceType'] != '') $where[] = ['a.invoiceType', '=', $param['invoiceType']];
-//		if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
-//		if ($param['invoiceNumber'] != '') $where[] = ['a.invoiceNumber', '=', $param['invoiceNumber']];
-//		if ($param['checkApi'] != '') $where[] = ['a.checkApi', '=', $param['checkApi']];
-//		if ($param['invoiceCode'] != '') $where[] = ['a.invoiceCode', '=', $param['invoiceCode']];
-//		if (($param['open_start'] != '') && ($param['open_end'] != '')) $where[] = ['a.open_time', 'between', [$param['open_start'], $param['open_end']]];
-//		if ($param['apply_id'] != '') $where[] = ['a.apply_id', '=', $param['apply_id']];
-//		if ($param['apply_name'] != '') $where[] = ['a.apply_name', 'like', '%' . $param['apply_name'] . '%'];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
 		if (($param['companyNo'] != '') && ($param['companyNo'] != '')) $where[] = ["b.companyNo","=",$param['companyNo']];
 		$status = [1 => '待系统验证', 2 => '买方公司审核', 3 => '待买方公司认证', 4 => '认证成功', 5 => '验证失败', 6 => '买方审核驳回', 7 => '认证失败', 8 => '回票流程终止', 9 => '验证超次数', 10 => '回票已退'];//认证状态
@@ -274,14 +250,6 @@ class Report extends Command
 	{
 //		$param = $this->request->only(['start' => '', 'end' => '', 'name' => '', 'bank' => '', 'status' => '', 'tradNo' => '', 'company' => '', 'userd_lower' => '', 'used_upper' => ''], 'post', 'trim');
 		$where = [['a.is_del', '=', 0], ['b.is_del', '=', 0]];
-//		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.trade_time', 'between', [$param['start'], $param['end']]];
-//		if ($param['name'] != '') $where[] = ['a.trade_out', 'like', '%' . $param['name'] . '%'];
-//		if ($param['bank'] != '') $where[] = ['a.trade_bank', 'like', '%' . $param['bank'] . '%'];
-//		if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
-//		if ($param['tradNo'] != '') $where[] = ['a.tradNo', 'like', '%' . $param['tradNo'] . '%'];
-//		if ($param['company'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['company'] . '%'];
-//		if ($param['userd_lower'] != '') $where[] = ['a.used_fee', '>=', $param['userd_lower']];
-//		if ($param['used_upper'] != '') $where[] = ['a.used_fee', '<=', $param['used_upper']];
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.addtime', 'between', [$param['start'], $param['end']]];
 		if (($param['companyNo'] != '') && ($param['companyNo'] != '')) $where[] = ["a.companyNo","=",$param['companyNo']];
 		$status = [1 => '未认领', 2 => '部分认领', 3 => '全部认领'];//状态
@@ -356,11 +324,6 @@ class Report extends Command
 			$value['商品类型'] = $this->qrdType[$value['商品类型']] ?? '';
 			yield $value;
 		}
-		//
-		//        if (empty($list)) $list[] = ['导出数据为空' => ''];
-		//
-		//        excelExport('回款核销明细表', array_keys($list[0]), $list);
-
 	}
 
 	//回票明细表
@@ -438,25 +401,7 @@ class Report extends Command
 			$value['税额'] = round($value['不含税采购成本']*$value['税率'],2) ;
 
 			yield $value;
-//			$item_list = json_decode($value['item_list'], true);
-//
-//			unset($value['item_list']);
-//			foreach ($item_list as $item) {
-//				$value['税额']= $item['tax'] ?? '';
-//				$value['票面税率']= $item['tax_rate'] ?? '';
-//				//                $list = array_merge($value, [
-//				//                    '税额' => $item['tax'] ?? '',
-//				//                    '票面税率' => $item['tax_rate'] ?? '',
-//				//                ]);
-//				yield $value;
-//			}
-
 		}
-
-		//        if (empty($list)) $list[] = ['导出数据为空' => ''];
-		//
-		//        excelExport('回票明细表', array_keys($list[0]), $list);
-
 	}
 
 	//经营分析报表
@@ -530,21 +475,13 @@ class Report extends Command
 		foreach ($data as $value) {
 			$value['订单来源'] = $this->qrdSource[$value['订单来源']] ?? '';
 			$value['库存性质'] = $this->qrdType[$value['库存性质']] ?? '';
-			//            $value['开票状态'] = $this->inv_status[$value['开票状态']] ?? '';
-			//            $value['回款状态'] = $this->pay_status[$value['回款状态']] ?? '';
 			$value['发货方式'] = $this->sendType[$value['发货方式']] ?? '';
-
 			$value['毛利润'] = round(bcsub($value['销售总额'], $value['采购总货款'], 3), 2);
 			$value['毛利率'] = $value['销售总额'] == 0 ? 0 : round(bcmul(bcsub(1, bcdiv($value['采购总货款'], $value['销售总额'], 5), 5), 100), 2) . '%';
 			$value['不含税采购成本'] = round(bcdiv($value['采购总货款'], bcadd(1,$value['采购税点']), 3), 2);
 
 			yield $value;
 		}
-
-		//        if (empty($list)) $list[] = ['导出数据为空' => ''];
-		//
-		//        excelExport('经营分析报表', array_keys($list[0]), $list);
-
 	}
 
 	//收入成本明细表
@@ -625,11 +562,6 @@ class Report extends Command
 			$value['销售来源'] = $this->qrdSource[$value['销售来源']] ?? '';
 			yield $value;
 		}
-
-		//        if (empty($list)) $list[] = ['导出数据为空' => ''];
-		//
-		//        excelExport('收入成本明细表', array_keys($list[0]), $list);
-
 	}
 
 	//应收台账表
@@ -787,7 +719,6 @@ class Report extends Command
 
 		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['createdTime', 'between', [$param['start'], $param['end']]];
 		if ($param['companyNo'] != '') $where[] = ['companyNo', '=', $param['companyNo']];
-//		if ($param['supplierNo'] != '') $where[] = ['supplierNo', '=', $param['supplierNo']];
 		$data = Db::name("cgd_info")->where($where)
 		          ->field("
         sequenceNo '采购单编号',
@@ -838,10 +769,6 @@ class Report extends Command
 			$value['发货状态'] = $this->sendStatus[$value['发货状态']];
 			yield $value;
 		}
-
-		//        if (empty($list)) $list[] = ['导出数据为空' => ''];
-		//
-		//        excelExport('采购单明细表', array_keys($list[0]), $list);
 	}
 
 	/**
@@ -959,4 +886,21 @@ class Report extends Command
 			yield $value;
 		}
 	}
+	//产品部门销售业绩
+	public function Q($param=[]){
+		$where = [["is_del","=",0],["status","in",[0,1,2]]];
+		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['addtime', 'between', [date("Y-m-d 00:00:00",strtotime($param['start'])),date("Y-m-d 23:59:59",
+		strtotime($param['end']))]];
+		if ($param['companyNo'] != '') $where[] = ['supplierNo', '=', $param['companyNo']];
+		$Db= Db::connect("mysql_wsm");
+		$list =$Db->name("sale")->field("orderCode 销售单号,apply_name 业务人员,apply_id 业务部门,cat_id 分类,total_price 产品货款总额,addtime 日期")
+		->where($where)
+		->cursor();
+		foreach ($list as $value){
+			$value['业务部门'] = $Db->name("depart_user")->alias("a")->leftjoin("company_item b","a.itemid=b.id")
+			->where(["a.is_del"=>0,"a.status"=>1,"a.uid"=>$value['业务部门']])->value("b.name",'');
+			$value['分类'] = $Db->name("cat")->where(["id"=>$value['分类']])->value("search","");
+			yield $value;
+		}
+	}
 }