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

app/admin/controller/Exec.php

@@ -158,6 +158,7 @@ class Exec extends \app\admin\BaseController{
 			["action"=>"K","name"=>'采购单明细表'],
 			["action"=>"M","name"=>'对账单汇总表'],
 			["action"=>"N","name"=>'退货台账'],
+			["action"=>"W","name"=>'对账单采购单明细'],
 
 			];
 		return app_show(0,"获取成功",$ation);

app/admin/controller/ExecStat.php

@@ -115,6 +115,7 @@ class ExecStat extends \app\admin\BaseController{
 			["action"=>"S","name"=>'项目部新政策提成业绩'],
 			["action"=>"T","name"=>'新媒体回款明细'],
 			["action"=>"U","name"=>'项目部旧政策回款明细'],
+			["action"=>"V","name"=>'退货明细'],
 			];
 		return app_show(0,"获取成功",$ation);
 	}

app/admin/controller/Payment.php

@@ -945,12 +945,17 @@ class Payment extends BaseController
 
 
     public function cgdQuery(){
-		$post = $this->request->only(["cgdNoArr"=>[],"status"=>"","relaComNo"=>'',"companyNo"=>"","supplierNo"=>""],"post");
+		$post = $this->request->only(["cgdNoArr"=>[],"qrdNoArr"=>[],"status"=>"","relaComNo"=>'',"companyNo"=>"","supplierNo"=>""],"post");
 		$valid=Validate::rule([
 			"cgdNoArr|采购单编号集合"=>"require|array",
+			"qrdNoArr|采购单编号集合"=>"array",
 			"status|采购单状态"=>"number|in:0,1,2,3"
 			]);
 		if($valid->check($post)==false) return error_show(1004,$valid->getError());
+		 if(!empty($post['qrdNoArr'])){
+         	$cgdNo = Db::name("qrd_info")->where(["sequenceNo"=>$post['qrdNoArr']])->column("cgdNo");
+         	$post["cgdNoArr"]=array_merge($post["cgdNoArr"],$cgdNo);
+         }
         $condition = [["cgdSource|cgdType","<>",1],['is_del',"=",0],["sequenceNo","in",$post["cgdNoArr"]]];
         $companyNo = isset($post['companyNo']) && $post['companyNo']!='' ? trim($post['companyNo']) :"";
         if($companyNo!=""){

app/admin/controller/Stat.php

@@ -126,12 +126,12 @@ class Stat extends BaseController{
 				$temp["dayinfo"] =Db::name("depart_company")
 				                    ->where("day_time",date("Y-m-d",strtotime($post["daytime"])))
 				                    ->where(["companyNo"=>$value])
-				                    ->column("sale_total,th_total,type,companyNo");;
+				                    ->column("sale_total,th_total,type,cgd_total,cgd_th_total,companyNo");;
 				$temp["monthinfo"] =Db::name("depart_company")
 				                      ->whereBetween("day_time",[date("Y-m-01",strtotime($post["daytime"])),date("Y-m-t",  strtotime($post["daytime"]))])
 				                      ->where(["companyNo"=>$value])
 				                      ->group("companyNo,type")
-				                      ->column("sum(sale_total) as msale_total,sum(th_total) as mth_total,companyNo,type");
+				                      ->column("sum(sale_total) as msale_total,sum(th_total) as mth_total,sum(cgd_total) as mcgd_total,sum(cgd_th_total) as mcgd_th_total,companyNo,type");
 				$return[]=$temp;
 			}
 
@@ -152,7 +152,10 @@ class Stat extends BaseController{
 		foreach ($depart_tips as $key=>$value){
 			$info = Db::name("depart_everyday")
 			->whereMonth("day_time",$post['year']."-".$key)
-			->field("sum(sale_total)  sum_sale_total,sum(th_total) sum_th_total,sum(cgd_total)  sum_cgd_total,sum(cgd_th_total) sum_cgd_th_total")
+			->field("sum(sale_total)  sum_sale_total,
+			sum(th_total) sum_th_total,
+			sum(cgd_total)  sum_cgd_total,
+			sum(cgd_th_total) sum_cgd_th_total")
 			->findOrEmpty();
 			$temp=[
 				"month"=>$key,
@@ -171,7 +174,7 @@ class Stat extends BaseController{
 
 		//月统计销售额
 	public function companyEvery(){
-		$post = $this->request->only(["year"=>date("Y"),"compamyNo"=>""],"post","trim");
+		$post = $this->request->only(["year"=>date("Y"),"companyNo"=>""],"post","trim");
 		$where=[];
 		if($post['companyNo']!='') $where=["companyNo"=>$post['companyNo']];
 		$depart_tips = Db::name("depart_tips")

app/command/Report.php

@@ -126,6 +126,14 @@ class Report extends Command
 		        $method="U";
 		        $file='项目部2月前业绩提成';
 		        break;
+		    case 'V':
+		        $method="V";
+		        $file='退货明细';
+		        break;
+		    case 'W':
+		        $method="W";
+		        $file='对账采购关联对照';
+		        break;
 			default:
 				$file='暂无数据';
 				$method="";
@@ -707,6 +715,7 @@ class Report extends Command
             "" 本次回票价款,
             "" 本次回票税额,
             "" 回票税率,
+            b.issue_date 开票日期,
             b.total 本次回票总金额,
             a.check_time 本次回票时间
             ')
@@ -719,7 +728,6 @@ class Report extends Command
 		$list = [];
 
 		foreach ($data as $value) {
-
 			$item_list = json_decode($value['item_list'], true);
 			unset($value['item_list']);
 			foreach ($item_list as $item) {
@@ -729,6 +737,8 @@ class Report extends Command
 					'本次回票价款' => $item['amount'] ?? '',
 					'本次回票税额' => $item['tax'] ?? '',
 					'回票税率' => $item['tax_rate'] ?? '',
+					'规格' => $item['specification'] ?? '',
+					'单位' => $item['unit'] ?? '',
 				]);
 			}
 		}
@@ -1218,4 +1228,50 @@ class Report extends Command
 			yield $value;
 		}
 	}
+
+	//退货明细
+	private function V($param=[]){
+		$where = [["is_del","=",0]];
+		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']))]];
+		$Db= Db::connect("mysql_wsm");
+		$list =$Db->name("th_data")->alias("a")
+		->leftJoin("sale b","a.orderCode=b.orderCode")
+		->field("a.thCode 退货单号,b.orderCode 销售单号,a.apply_name 业务人员,a.apply_id 业务部门,a.cat_id 分类,a.th_fee 退货金额,a.addtime 日期")
+		->where($where)
+		->cursor();
+		$depart=[];
+		foreach ($list as $value){
+			if(!isset($depart[$value['业务部门']])){
+				$temp = getDepartByUid($value['业务部门']);
+				if(isset($temp['data']) && !empty($temp['data']))
+					$depart[$value['业务部门']]=$temp['data'][$value['业务部门']];
+			}
+			$value['业务部门'] = $depart[$value['业务部门']]??"";
+			$value['分类'] = $Db->name("cat")->where(["id"=>$value['分类']])->value("search","");
+			yield $value;
+		}
+	}
+
+	//对账单采购单明细
+	private function W($param=[]){
+		$where = [["a.is_del","=",0],["b.is_del","=",0],["a.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[] = ["a.companyNo","=",$param['companyNo']];
+		$list =Db::name("pay")->alias("a")
+		->leftJoin("pay_info b","a.payNo=b.payNo and b.status=1")
+		->field("
+		a.payNo 对账编号,
+		b.cgdNo 采购单编号,
+		b.total_fee 采购单对账金额,
+		a.total_fee 对账总金额,
+		a.apply_name 对账申请人,
+		a.supplierName 供应商名称")
+		->where($where)
+		->cursor();
+		foreach ($list as $value){
+			yield $value;
+		}
+	}
 }