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

app/admin/controller/Exec.php

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

app/admin/controller/Payment.php

@@ -42,7 +42,7 @@ class Payment extends BaseController
         }
          $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime']))
         :"";
-        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime']))
+        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['endTime']))
          :"";
         $supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         $supplierName= isset($post['supplierName'])&&$post['supplierName']!="" ? trim($post['supplierName']) :"";
@@ -146,7 +146,7 @@ class Payment extends BaseController
             $condition[]=["apply_id","=",$this->uid];
         }
         $startTime= isset($post['startTime'])&&$post['startTime']!="" ? date("Y-m-d 00:00:00",strtotime($post['startTime'])) :"";
-        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['startTime'])) :"";
+        $endTime= isset($post['endTime'])&&$post['endTime']!="" ? date("Y-m-d 23:59:59",strtotime($post['endTime'])) :"";
         $supplierNo= isset($post['supplierNo'])&&$post['supplierNo']!="" ? trim($post['supplierNo']) :"";
         $supplierName= isset($post['supplierName'])&&$post['supplierName']!="" ? trim($post['supplierName']) :"";
         $payNo= isset($post['payNo'])&&$post['payNo']!="" ? trim($post['payNo']) :"";
@@ -947,8 +947,8 @@ class Payment extends BaseController
     public function cgdQuery(){
 		$post = $this->request->only(["cgdNoArr"=>[],"qrdNoArr"=>[],"status"=>"","relaComNo"=>'',"companyNo"=>"","supplierNo"=>""],"post");
 		$valid=Validate::rule([
-			"cgdNoArr|采购单编号集合"=>"require|array",
-			"qrdNoArr|采购单编号集合"=>"array",
+			"cgdNoArr|采购单编号集合"=>"requireWithout:qrdNoArr|array",
+		    "qrdNoArr|销售单编号集合"=>"requireWithout:cgdNoArr|array",
 			"status|采购单状态"=>"number|in:0,1,2,3"
 			]);
 		if($valid->check($post)==false) return error_show(1004,$valid->getError());

app/command/Report.php

@@ -1232,7 +1232,7 @@ class Report extends Command
 	//退货明细
 	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",
+		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.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")
@@ -1256,7 +1256,7 @@ class Report extends Command
 	//对账单采购单明细
 	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",
+		if (($param['start'] != '') && ($param['end'] != '')) $where[] = ['a.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")