From 8145df3662ec3ada6548e674f551a853ceae5b8c Mon Sep 17 00:00:00 2001 From: altobaltobaltob <32124724+altobaltobaltob@users.noreply.github.com> Date: Fri, 6 Jul 2018 15:26:03 +0800 Subject: [PATCH] Add files via upload --- controllers/reports/Vghtc_report_daily.php | 3 ++- controllers/reports/Vghtc_report_month.php | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/controllers/reports/Vghtc_report_daily.php b/controllers/reports/Vghtc_report_daily.php index f9ed38c..4293bbf 100644 --- a/controllers/reports/Vghtc_report_daily.php +++ b/controllers/reports/Vghtc_report_daily.php @@ -77,7 +77,8 @@ class Vghtc_report_daily extends CI_Controller { $name=$value['name']; $note=$value['note']; - if($in_lane==2 or $in_lane==3 or $in_lane==8 or $in_lane==9 or $in_lane==10 or $in_lane==11){ + //if($in_lane==2 or $in_lane==3 or $in_lane==8 or $in_lane==9 or $in_lane==10 or $in_lane==11){ + if($in_lane==0 or $in_lane==1){ $sel_cario=$this->erpapidb->sel_cario($in_lane,$start,$end); }else{ $sel_cario=$this->erpapidb->sel_cario_out($in_lane,$start,$end); diff --git a/controllers/reports/Vghtc_report_month.php b/controllers/reports/Vghtc_report_month.php index d9d19fe..08b1b3d 100644 --- a/controllers/reports/Vghtc_report_month.php +++ b/controllers/reports/Vghtc_report_month.php @@ -77,7 +77,8 @@ class Vghtc_report_month extends CI_Controller { $name=$value['name']; $note=$value['note']; - if($in_lane==2 or $in_lane==3 or $in_lane==8 or $in_lane==9 or $in_lane==10 or $in_lane==11){ + //if($in_lane==2 or $in_lane==3 or $in_lane==8 or $in_lane==9 or $in_lane==10 or $in_lane==11){ + if($in_lane==0 or $in_lane==1){ $sel_cario=$this->erpapidb->sel_cario($in_lane,$start,$end); }else{ $sel_cario=$this->erpapidb->sel_cario_out($in_lane,$start,$end); @@ -130,14 +131,14 @@ class Vghtc_report_month extends CI_Controller { "dateba_lane_1" => $dateba_lane_1, "dateba_lane_2" => $dateba_lane_2, "dateba_lane_3" => $dateba_lane_3, - "dateba_lane_4" => $dateba_lane_4, + /* "dateba_lane_4" => $dateba_lane_4, "dateba_lane_5" => $dateba_lane_5, "dateba_lane_6" => $dateba_lane_6, "dateba_lane_8" => $dateba_lane_8, "dateba_lane_9" => $dateba_lane_9, "dateba_lane_10" => $dateba_lane_10, "dateba_lane_11" => $dateba_lane_11, - "dateba_lane_12" => $dateba_lane_12, + "dateba_lane_12" => $dateba_lane_12,*/ ); // "sel_cario_tatal" => $sel_cario_tatal // "dateba" => $alltatle,