From 8094987c82cd546e299a3272b7ce77ebdd9d681e Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Fri, 4 Aug 2017 11:37:47 +0530
Subject: [PATCH] mrir

---
 application/controllers/MRIRcontroller.php | 11 +++++++----
 application/models/mrir_model.php          |  3 ++-
 application/views/Mrirprintpdf.php         |  8 +++++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php
index d83d30b3..efd85a5a 100755
--- a/application/controllers/MRIRcontroller.php
+++ b/application/controllers/MRIRcontroller.php
@@ -53,7 +53,9 @@ class MRIRcontroller extends BaseController
         $this->global['pageTitle'] = 'Siddharth : MRIR Pdf ';
         $data['CompanyDetails'] =  $this->purchaseorder_model->getCompanyInformation();
         //print_r($data['CompanyDetails']);
-        $data['MRIRDetails'] = $this->purchaseorder_model->edit_mrir($MrirNo);
+        $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo);
+
+        //$data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo);
         //print_r($data['MRIRDetails']);
         $this->load->View("Mrirprintpdf",$data, NULL);
             
@@ -69,7 +71,7 @@ class MRIRcontroller extends BaseController
             $this->dompdf->load_html($php);
             $this->dompdf->render();
             $data['Attachment'] = FALSE;
-            $this->dompdf->stream("MrirDetails.pdf",$data,$php);
+           $this->dompdf->stream("MrirDetails.pdf",$data,$php);
           
     }
     
@@ -139,6 +141,7 @@ public function viewmMaterialDistributionList()
         $MrirNo =  $_GET['MRIRNO'];
                         
         $data['MRIRDetails'] = $this->mrir_model->edit_mrir($MrirNo);//get_MRIR_Values($MrirNo);
+        //print_r($data['MRIRDetails']);
 
         $this->global['pageTitle'] = 'Siddharth : Edit Material Inspection Report';       
 
@@ -257,8 +260,8 @@ public function viewmMaterialDistributionList()
 								
                                 
                                 $remark=$this->input->post('Remarks1'.$i);
-                                echo $remark;
-                                die();
+                                //echo $remark;
+                                //die();
                                 $updateby=$this->session->userdata('userId');
                                 $date = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
                                 $updateon = $date->format('Y-m-d H:i:s');
diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php
index 0e19c45a..3337adea 100755
--- a/application/models/mrir_model.php
+++ b/application/models/mrir_model.php
@@ -129,12 +129,13 @@ function ViewDistributionList()
      function edit_mrir($MrirNo)
     {
       $this->db->distinct();
-      $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon,TMD.MRIRItemNo,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus');
+      $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon as MRIRCreatedon,TMD.MRIRItemNo,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate as IGRCreated,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus,POLT.CostCenterCode,COST.CostCenterName,IGRD.Remarks');
       $this->db->from ('T_MRIR_Master TMM'); 
       $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO');//to get IGRNO,PONO,MRIRNO,mrirdate,
       $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO = TMM.IGRNO');//to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,
       $this->db->join ('T_PurchaseOrder_Master  POMR ','IGRM.PONO = POMR.PONO');//to get podate,deliverydate,servicedescription
       $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO');//to get receivedquantity,quantity
+      $this->db->join('T_CostCenter_Master COST','POLT.CostCenterCode=COST.CostCenterCode');
       $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO = IGRM.IGRNO');//to get invoicequantity
       $this->db->join ('T_MaterialMaster  MM','TMD.MaterialCode = MM.MaterialCode');
       $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID = SUPP.SupplierID');//to get suppliername,supplieraddress
diff --git a/application/views/Mrirprintpdf.php b/application/views/Mrirprintpdf.php
index fe72b005..f96e43af 100755
--- a/application/views/Mrirprintpdf.php
+++ b/application/views/Mrirprintpdf.php
@@ -3,8 +3,8 @@
  
        
 		$CompanyAddress = '';
-        $CompanyName = '';
-	    $SuplierName = '';
+    $CompanyName = '';
+	  $SuplierName = '';
 		$SuplierAddress = '';
 		$DeliveryAddress = '';
 		
@@ -39,6 +39,8 @@
         $dt3='';
         $dt4='';
         $MRIRNO='';
+        $MRIRCreatedon='';
+        $Remarks='';
 
       if(!empty($MRIRDetails))
       {
@@ -46,7 +48,7 @@
       	{
       	   $IGRNO=$MRIR->IGRNO;
       	   $IGRRAISEDBY=$MRIR->IGRRasiedbyName;
-           $dt1=new DateTime($MRIR->Createdon,new DateTimeZone('Asia/Kolkata'));
+           $dt1=new DateTime($MRIR->IGRCreated,new DateTimeZone('Asia/Kolkata'));
       	   $IGRCREATEDON=$dt1->format('d-m-y');
       	   $PONO=$MRIR->PONO;
            $dt=new DateTime($MRIR->PODate, new DateTimeZone('Asia/Kolkata'));