ad

app/admin/controller/SaleReport.php

@@ -2307,7 +2307,14 @@ class SaleReport extends Base
     {
 
 
-	    $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'apply_company' => '', 'page' => 1, 'size' => 15, 'order_type' => ''], 'post', 'trim');
+	    $param = $this->request->only(['token',
+	    'start_date' => '',
+	    'end_date' => '',
+	    'status' => '',
+	    'apply_company' => '',
+	    "supplierNo"=>"",
+	    "companyNo"=>"",
+	    'page' => 1, 'size' => 15, 'order_type' => ''], 'post', 'trim');
 
 	    $where = [['a.send_type', '=', 2], ['a.is_del', '=', 0], ['a.status', '<>', 3], ['a.send_status', '<>', 3]];
 	    //send_type==2 延迟发货
@@ -2315,6 +2322,8 @@ class SaleReport extends Base
 	    if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
 //	    if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
 	    if ($param['order_type'] != '') $where[] = ['a.order_type', '=', $param['order_type']];
+	    if ($param['supplierNo'] != '') $where[] = ['a.supNo', 'like', "%{$param['supplierNo']}%"];
+	    if ($param['companyNo'] != '') $where[] = ['a.supplierNo', 'like',"%{$param['companyNo']}%"];
 
 	    $count_row = Db::name('sale')
 	               ->alias('a')
@@ -2359,14 +2368,22 @@ class SaleReport extends Base
     public function saleNotAddrExport()
     {
 
-        $param = $this->request->only(['token', 'start_date' => '', 'end_date' => '', 'status' => '', 'apply_company' => '', 'order_type' => ''], 'post', 'trim');
+        $param = $this->request->only(['token',
+        'start_date' => '',
+        'end_date' => '',
+        "supplierNo"=>"",
+	    "companyNo"=>"",
+	    'status' => '',
+	    'apply_company' => '',
+	    'order_type' => ''], 'post', 'trim');
 
         $where = [['a.send_type', '=', 2], ['a.is_del', '=', 0], ['a.status', '<>', 3],['a.send_status', '<>', 3]];//send_type==2 延迟发货
         if ($param['start_date'] != '' && $param['end_date'] != '') $where[] = ['a.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         if ($param['status'] != '') $where[] = ['a.status', '=', $param['status']];
 //        if ($param['apply_company'] != '') $where[] = ['ci.name', 'like', '%' . $param['apply_company'] . '%'];
         if ($param['order_type'] != '') $where[] = ['a.order_type', '=', $param['order_type']];
-
+        if ($param['supplierNo'] != '') $where[] = ['a.supNo', 'like', "%{$param['supplierNo']}%"];
+	    if ($param['companyNo'] != '') $where[] = ['a.supplierNo', 'like',"%{$param['companyNo']}%"];
         $data = Db::name('sale')
             ->alias('a')
             ->field("a.orderCode 订单编号,a.order_type 订单类型,
@@ -2644,10 +2661,16 @@ class SaleReport extends Base
     //【十三、供应商采购订单情况】
     public function purcheaseOrderMonth()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+        $param = $this->request->only(['token',
+	        'supplierNo' => '',
+	        'companyNo' => '',
+	        'supplier_name' => '',
+	        'start_day' => date('Y-m-01'),
+	        'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
@@ -2774,11 +2797,12 @@ class SaleReport extends Base
     //【十三、供应商采购订单情况-导出】
     public function purcheaseOrderMonthExport()
     {
-        $param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+        $param = $this->request->only(['token', 'supplierNo' => '', 'companyNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplier_name', 'like', '%' . $param['supplier_name'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 
@@ -3086,12 +3110,20 @@ class SaleReport extends Base
     }
 	//竞价单反馈情况
 	 public function FeedBackBySupplier(){
-		 $param = $this->request->only(['supplierNo' => '', 'supplier_name' => '','start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+		 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 	'start_day' => date('Y-m-01'),
+		 	'end_day' => date('Y-m-t')], 'post', 'trim');
 
         $where = [['a.is_del', '=', 0]];
 
         if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['b.companyNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['b.companyName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 		$list =Db::name("consult_bids")->alias("a")
 		->leftJoin("consult_order b","a.zxNo=b.zxNo")
@@ -3140,10 +3172,23 @@ class SaleReport extends Base
 	 }
 	//当日库存销售情况
 	 public function saleStock(){
-		$param = $this->request->only(['supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+			 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 	'page' => 1,
+		 	'size' => 15,
+		 	'start_day' => date('Y-m-01'),
+		 	'end_day' => date('Y-m-t')
+		 	], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0]];
+
+        if ($param['supplierNo'] != '') $where[] = ['a.supNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['supplier_name'] != '') $where[] = ['a.supName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 	        $count = Db::name('sale')
             ->alias('a')
@@ -3171,10 +3216,19 @@ class SaleReport extends Base
 
 	 	//当日库存销售情况导出
 	 public function saleStockExport(){
-		$param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+		 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0]];
+
+        if ($param['supplierNo'] != '') $where[] = ['a.supNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['supplier_name'] != '') $where[] = ['a.supName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
         $list=Db::name("sale")->alias("a")
          ->leftJoin('order_num on', 'a.orderCode=on.orderCode')
@@ -3200,10 +3254,21 @@ class SaleReport extends Base
 
 		//待库管发货
 	 public function OutChildList(){
-		$param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+		 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 		 	'page' => 1,
+		 	'size' => 15,
+		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0]];
+
+        if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['a.companyName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
         $count = Db::name("order_out_child")->alias("a")->where($where)->count();
         $list = Db::name("order_out_child")
@@ -3256,10 +3321,19 @@ class SaleReport extends Base
 
 	 //待库管发货
 	 public function OutChildExport(){
-		$param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
+		 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0]];
+
+        if ($param['supplierNo'] != '') $where[] = ['a.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
         if ($param['supplier_name'] != '') $where[] = ['a.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['a.companyNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['a.companyName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
         $list = Db::name("order_out_child")
         ->alias("a")
@@ -3315,10 +3389,21 @@ class SaleReport extends Base
 
 	//待采购备货
 	public function OrderOutBk(){
-		$param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0],['a.status', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['supplier_name'] != '') $where[] = ['b.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+
+	 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 		 	'page' => 1,
+		 	'size' => 15,
+		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0],['a.status', '=', 0]];
+        if ($param['supplierNo'] != '') $where[] = ['b.supNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['supplier_name'] != '') $where[] = ['b.supName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['b.supplierName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
 		$count= Db::name("order_out")->alias("a")
 		->leftJoin("sale b","a.orderCode=b.orderCode")
@@ -3357,10 +3442,18 @@ class SaleReport extends Base
 
 		//待采购备货
 	public function OrderOutExport(){
-		$param = $this->request->only(['token', 'supplierNo' => '', 'supplier_name' => '', 'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t'),'page' => 1, 'size' => 15], 'post', 'trim');
-		$where = [['a.is_del', '=', 0],['a.status', '=', 0]];
-		if ($param['supplierNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['supplierNo'] . '%'];
-        if ($param['supplier_name'] != '') $where[] = ['b.supplierName', 'like', '%' . $param['supplier_name'] . '%'];
+	 $param = $this->request->only([
+		 	'supplierNo' => '',
+		 	'companyNo' => '',
+		 	'companyName' => '',
+		 	'supplier_name' => '',
+		 	'start_day' => date('Y-m-01'), 'end_day' => date('Y-m-t')], 'post', 'trim');
+
+        $where = [['a.is_del', '=', 0],['a.status', '=', 0]];
+        if ($param['supplierNo'] != '') $where[] = ['b.supNo', 'like', '%' . $param['supplierNo'] . '%'];
+        if ($param['supplier_name'] != '') $where[] = ['b.supName', 'like', '%' . $param['supplier_name'] . '%'];
+        if ($param['companyNo'] != '') $where[] = ['b.supplierNo', 'like', '%' . $param['companyNo'] . '%'];
+        if ($param['companyName'] != '') $where[] = ['b.supplierName', 'like', '%' . $param['companyName'] . '%'];
         if ($param['start_day'] != '' && $param['end_day'] != '') $where[] = ['a.addtime', 'between', [$param['start_day'] . ' 00:00:00', $param['end_day'] . ' 23:59:59']];
         $list =Db::name("order_out")->alias("a")
 		->leftJoin("sale b","a.orderCode=b.orderCode")
@@ -3395,8 +3488,7 @@ class SaleReport extends Base
 		b.addtime 下单日期,
 		datediff(now(),a.addtime) 时效,
 		b.cgder 供应商负责人")
-		->page($param['page'],$param['size'])
-	        ->where($where)
+	    ->where($where)
 		->cursor();
         $data=[];
 //		$platArr =array_column($list,"平台类型");