From 107c90a49d49c2c4413b2274b4778acf16a9ddbf Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 13 Aug 2024 05:03:04 +0000 Subject: [PATCH 1/3] FIX_IGR files Changes --- app/Config/Routes.php | 6 +- app/Controllers/Emergencypurchaseorder.php | 4 +- app/Controllers/Inwardgateregister.php | 208 +++- app/Models/Inwardgateregister_model.php | 67 +- app/Models/Requistion_model.php | 5 +- app/Views/alterpurchaseorder.php | 303 ++--- app/Views/capitalpurchaseorder.php | 2 +- app/Views/editCapitalAmendPO.php | 2 +- app/Views/editRevenueAmendPO.php | 2 +- app/Views/inwardgateregister.php | 121 +- app/Views/requisitionlisting.php | 13 +- app/Views/viewinwardgateregister.php | 186 +++- public/uploads/POfiles/SECLIENT.jpg | Bin 0 -> 11487 bytes public/uploads/POfiles/SupplierBills.png | Bin 0 -> 2512 bytes public/uploads/POfiles/WorkPlace2.jpeg | Bin 0 -> 6399 bytes public/uploads/POfiles/WorkPlace2_1.jpeg | Bin 0 -> 6399 bytes public/uploads/POfiles/WorkPlace2_2.jpeg | Bin 0 -> 6399 bytes public/uploads/POfiles/WorkPlace3.jpeg | Bin 0 -> 8933 bytes public/uploads/POfiles/ria_test.sql | 1171 ++++++++++++++++++++ 19 files changed, 1846 insertions(+), 244 deletions(-) create mode 100644 public/uploads/POfiles/SECLIENT.jpg create mode 100644 public/uploads/POfiles/SupplierBills.png create mode 100644 public/uploads/POfiles/WorkPlace2.jpeg create mode 100644 public/uploads/POfiles/WorkPlace2_1.jpeg create mode 100644 public/uploads/POfiles/WorkPlace2_2.jpeg create mode 100644 public/uploads/POfiles/WorkPlace3.jpeg create mode 100644 public/uploads/POfiles/ria_test.sql diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 51dc80fe..1c314c49 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -246,7 +246,6 @@ $routes->get('AddIGR', 'Inwardgateregister::addIGR'); // ADD IGR page - working $routes->get('ViewIGR', 'Inwardgateregister::viewIGR'); // View IGR PAGE - Working $routes->post('ViewIGRDetails', 'Inwardgateregister::viewIGRDetails'); $routes->post('GetIGRLineItemDetails', 'Inwardgateregister::getIGRLineItemDetails'); -$routes->post('deleteBillFile', 'Inwardgateregister::deleteBillFile'); $routes->post('SaveIGR', 'Inwardgateregister::SaveIGR');// Save IGR PAGE - Working $routes->post('UpdateIGR', 'Inwardgateregister::UpdateIGR'); $routes->post('updateIGRWeight', 'Inwardgateregister::updateIGRWeight'); @@ -254,7 +253,10 @@ $routes->post('UpdateIGRLineItem', 'Inwardgateregister::updateIGRLineItem'); $routes->post('ViewIGRHistory', 'Inwardgateregister::ViewIGRHistory'); $routes->post('getCostCenterData', 'Inwardgateregister::getCostCenterData'); $routes->post('ViewIGRfile', 'Inwardgateregister::ViewIGRfile'); -$routes->post('inwardgateregister/addloadfile', 'Inwardgateregister::addloadfile'); +$routes->post('getAdditionalIGRFile', 'Inwardgateregister::getAdditionalIGRFile'); +$routes->post('deleteAdditionalIGRFile', 'Inwardgateregister::deleteAdditionalIGRFile'); +$routes->get('download-files/(:segment)', 'Inwardgateregister::downloadFilesAsZip/$1'); + $routes->post('inwardgateregister/edituploadfile', 'Inwardgateregister::edituploadfile'); // Application OGR Page diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 671ee3ed..df4d8f5c 100644 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -1325,7 +1325,9 @@ class Emergencypurchaseorder extends BaseController $SupplierID = $this->request->getPost('drpSupplier'); $newsup = (string)$this->request->getPost('newsup'); - $newSupId = split("[ - ]+", $newsup); + // echo $newsup;die; + // $newSupId = split("[ - ]+", $newsup); + $newSupId = preg_split('/[ - ]+/', $newsup); /*-----------------------------------*/ $b4supplier = $this->request->getPost('b4supplier'); $b4date = $this->request->getPost('b4podate'); diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 2e75b53e..d2c5ce2a 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -8,6 +8,8 @@ use CodeIgniter\Validation\Exceptions\ValidationException; use App\Models\Inwardgateregister_model; +use ZipArchive; + /** * Module : IGR (security) * Inwardgateregister Class to control all igr related operations. @@ -71,6 +73,9 @@ class Inwardgateregister extends BaseController $data['PO_NO'] = array_filter($result, function($item) { return !($item->status === 'ST027'); }); + $data['emp_data'] = []; + // $data['emp_data'] = $this->inwardgateregister_model->getAdditionalIGRFile(); + // print_r($data['PO_NO']);die; $this->loadViews("inwardgateregister", $this->global, $data, NULL); } @@ -201,7 +206,7 @@ class Inwardgateregister extends BaseController $PO = $this->request->getPost('id'); $CreatedBy = $this->session->get('userId'); - $this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy); + $this->inwardgateregister_model->UpdatePOMaster($PO, $CreatedBy,IGR_CREATED); $data = $this->inwardgateregister_model->viewpurchaseorder($PO); echo json_encode($data); @@ -209,7 +214,7 @@ class Inwardgateregister extends BaseController - function addloadfile() + function getAdditionalIGRFile() { $lastinsertbillid = 0; @@ -221,7 +226,7 @@ class Inwardgateregister extends BaseController $file = $this->request->getFile('file'); $requestfilename = $file->getName(); - $files = $this->inwardgateregister_model->getfies($igr); + $files = $this->inwardgateregister_model->getAdditionalIGRFile($igr); $fcount = 0; foreach ($files as $value) { @@ -247,7 +252,7 @@ class Inwardgateregister extends BaseController $myfiles = array('PONO' => $pono, 'IGRNO' => $igr, 'FilePath' => $Picture); - $lastinsertbillid = $this->inwardgateregister_model->fileupload($myfiles); + $lastinsertbillid = $this->inwardgateregister_model->uploadAdditionalFile($myfiles); } } @@ -258,18 +263,17 @@ class Inwardgateregister extends BaseController } } - function deleteBillFile(){ + function deleteAdditionalIGRFile(){ - $deleteBillFile = ''; - - $Billno = $this->request->getPost('Billno'); - $deleteBillFile = $this->inwardgateregister_model->deleteBillFile($Billno); - - if ($deleteBillFile) { - echo "file deleted successfully!"; - } else { - echo "file details not exist to delete"; - } + $deleteAdditionalFile = false; + $fileid = $this->request->getPost('id'); + $deleteAdditionalFile = $this->inwardgateregister_model->deleteAdditionalFile($fileid); + return $deleteAdditionalFile; + // if ($deleteAdditionalFile) { + // echo "file deleted successfully!"; + // } else { + // echo "file details not exist to delete"; + // } } @@ -307,8 +311,10 @@ class Inwardgateregister extends BaseController function SaveIGR() { + //print_r($this->request->getPost());die; #Step 1 IGR Details $PONO = $this->request->getPost('PONO'); + $IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder'); $DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo'); $DeliveryChellan = (string)$this->request->getPost('InvoiceDate'); $DeliveryChellanDate = get_date_time_format($DeliveryChellan); @@ -321,8 +327,8 @@ class Inwardgateregister extends BaseController $RowCount = $this->request->getPost('txtRowCount'); $createddt = get_current_date_time(); //$IGRStatus = IGR_CREATED;//old - $IGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT; - + $PreIGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT; + $IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $PreIGRStatus; $igr = array(); // For IGR Master $paymentstatus = NO_PAIDIGR; @@ -353,10 +359,38 @@ class Inwardgateregister extends BaseController #Step 3 Master Details Gathering to Save In DB $igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus); $igr['MasterFile'] = $requestMasterFileName; + // print_r( $igr );die; #Step 4 Calling DB to Save IGR Master $IGRNO = $this->inwardgateregister_model->addigrM($igr); + // Get the uploaded files + // $IGRNO = "IGRNO02750"; // $IGRNO = "IGRNO02734"; if($IGRNO){ + $files = $this->request->getFiles(); + $fileNames = $this->request->getPost('file_name'); // Get user-entered file names + if(isset($files['emp_file'])) + { + foreach ($files['emp_file'] as $index => $file) { + if ($file->isValid() && !$file->hasMoved()) { + // Move the file to the desired directory + $newName = $file->getRandomName(); + $file->move($path, $newName); + // Store the file information in the database + $additionalFiles = array( + 'Remarks' => $fileNames[$index], + 'FilePath' => $newName, + 'IGRNO' => $IGRNO, + 'PONO' => $PONO + ); + $lastInsertFileId = $this->inwardgateregister_model->uploadAdditionalFile($additionalFiles); + if ($lastInsertFileId) { + $fileupdated_count++; + $fileupdated_name[] = $fileNames[$index]; + } + } + } + } + #Step 5 Save Master Detail On History Table if($VehicleNo){ $igr_history = array('field' => 'VehicleNo','is_add' => 1,'new_data' => $VehicleNo,'old_data' => NULL,'history_dated' => get_current_date_time(),'by' => $this->session->get('userId'),'IGR_No' => $IGRNO); @@ -427,7 +461,6 @@ class Inwardgateregister extends BaseController $GrossWeightDate = !empty($grossWeightDate) && is_string($grossWeightDate) ? date('Y-m-d H:i:s', strtotime($grossWeightDate)) : null; $TareWeightDate = !empty($tareWeightDate) && is_string($tareWeightDate) ? date('Y-m-d H:i:s', strtotime($tareWeightDate)) : null; log_message('error', "TareWeightDate" . $TareWeightDate); - if (strlen($QuantityAsPerInvoice) > 0 && $QuantityAsPerInvoice != '0') { $Remarks = $this->request->getPost('txtRemarks' . $i); $ItemStatus = ''; @@ -514,18 +547,56 @@ class Inwardgateregister extends BaseController $POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt); $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode); } + else if ((int)$IsThisOpenOrderPO == 1) { + $ItemStatus = POLINEITEM_IGRPARTIAL_CREATED; + + # Is this open order po means i have to save IGR DETAILS + $Remarks = $this->request->getPost('txtRemarks' . $i); + $ItemStatus = POLINEITEM_IGRPARTIAL_CREATED; + $CreatedBy = $this->session->get('userId'); + $igrDetails = array('IGRNO' => $IGRNO, 'MaterialCode' => $MaterialCode, 'QuantityAsPerInvoice' => $QuantityAsPerInvoice, 'Remarks' => $Remarks, 'IGRItemStatus' => $IGRItemStatus,'GrossWeight' => (float)$GrossWeight ,'GrossWeightDate'=> $GrossWeightDate,'TareWeight' => (float)$TareWeight ,'TareWeightDate' => $TareWeightDate ,'NetWeight' => (float)$NetWeight, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt); + $igrDetails['WeightFile'] = $requestWeightFileName; + $igrD = $this->inwardgateregister_model->addigrD($igrDetails); + $igrD =''; + $igrlineno = !empty($igrD) ? $igrD : ''; + log_message('error', 'SaveIGR igrDetails result : ' . json_encode($igrDetails)." IgrLineNo : ".$igrlineno); + $itemvalue = ''; + $SupplierId = ''; + $polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO, $MaterialCode); + foreach ($polineitemvalue as $it) { + $itemvalue = $it->Rate; + $SupplierId = $it->SupplierID; + } + # Is this open order po means i have to save add material history + $historydetails = array('MaterialCode' => $MaterialCode, 'Transaction_type' => "Add", 'Ref_Type' => "IGR", 'Ref_No' => $igrlineno, 'Quantity' => $QuantityAsPerInvoice, 'CreatedBy' => $CreatedBy, 'CreatedOn' => $createddt, 'SupplierID' => $SupplierId, 'ItemValue' => $itemvalue); + $this->inwardgateregister_model->addmaterialhistory($historydetails); + + # Is this open order po means i have to save the get received qty in PO lineitem table + $get_pre_qty = $this->inwardgateregister_model->get_CurrentQty($MaterialCode); + $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO, $MaterialCode); + $ReceivedQuantity = 0.00; + if (count($Recqty) > 0) { + foreach ($Recqty as $key) { + $ReceivedQuantity = $key->ReceivedQuantity; + } + } + $totalReceivedqty = $ReceivedQuantity + $QuantityAsPerInvoice; + $POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt); + $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONO, $MaterialCode); + } } - $this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy); + $this->inwardgateregister_model->UpdatePOMaster($PONO, $CreatedBy,$IGRStatus); #Step 9 Updating Pending Quantity IN PO Master amd Line Item Details. + if ((int)$IsThisOpenOrderPO != 1) { if ($TotalPendingQty == 0.00) { $Newstatus = array('Status' => $IGRStatus); $this->inwardgateregister_model->POLineItemsupdatestatus($PONO, $Newstatus); $this->inwardgateregister_model->pomasterupdatestatus($PONO, $Newstatus); } else { /*echo 'error' ;*/ - } + }} #finally $finalstatement = "Successfully Created IGR Number: $IGRNO \n"; if ($fileupdated_count > 0) { @@ -555,7 +626,9 @@ function viewIGRDetails() $IGRNO = $this->request->getPost('id'); - $data = $this->inwardgateregister_model->viewigr($IGRNO); + $data['details'] = $this->inwardgateregister_model->viewigr($IGRNO); + $data['files'] = $this->inwardgateregister_model->viewIGRFile($IGRNO); + // echo $IGRNO; // print_r($data);die; @@ -588,6 +661,7 @@ function viewIGRDetails() { $IGRNo = $this->request->getPost('igr'); + $PONo = $this->request->getPost('po'); $DeliveryChellan = $this->request->getPost('invdate'); $DeliveryChellanDate = !$DeliveryChellan || $DeliveryChellan === null ? NULL : get_date_time_format($DeliveryChellan); @@ -627,7 +701,37 @@ function viewIGRDetails() } } } - + $fileupdated_count = 0; + $fileupdated_name = []; + + $fileNames = $this->request->getPost('file_name'); + $files = $this->request->getFiles(); + + if(isset($files['emp_file'])) + { + foreach ($files['emp_file'] as $index => $file) { + + if ($file->isValid() && !$file->hasMoved()) { + + // Move the file to the desired directory + $newName = $file->getRandomName(); + $file->move($path, $newName); + // Store the file information in the database + $additionalFiles = array( + 'Remarks' => $fileNames[$index], + 'FilePath' => $newName, + 'IGRNO' => $IGRNo, + 'PONO' => $PONo + ); + $lastInsertFileId = $this->inwardgateregister_model->uploadAdditionalFile($additionalFiles); + if ($lastInsertFileId) { + $fileupdated_count++; + $fileupdated_name[] = $fileNames[$index]; + } + } + } + } + log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr)); $updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo); if(!empty($tableData )){ @@ -877,12 +981,21 @@ function viewIGRDetails() } } if ($updateigrmaster > 0) { - echo "Updated Succefully!"; + $finalstatement = "Successfully Updated IGR Number: $IGRNo \n"; } else if($updateigrlineitem >0){ - echo "Updated Succefully!"; + $finalstatement = "Successfully Updated IGR Number: $IGRNo \n"; }else{ - echo "Not Updated!"; + $finalstatement = "IGR Number: $IGRNo \n"; } + + if ($fileupdated_count > 0) { + $finalstatement .= "Number of files updated: $fileupdated_count \n"; + $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name); + } else { + $finalstatement .= "No files to update"; + } + + echo $finalstatement; } function updateIGRLineItem() { @@ -1156,6 +1269,7 @@ function viewIGRDetails() } } + function updateIGRWeight(){ $GrossWeight = $this->request->getPost('GrossWeight'); $GrossWeightDate = $this->request->getPost('GrossWeightDate'); @@ -1166,8 +1280,8 @@ function updateIGRWeight(){ $IGRItemNo = $this->request->getPost('IGRlineitem'); $updateby = $this->session->get('userId'); $WeightFile = $this->request->getfile('WeightFile'); - $GrossWtDt = !empty($GrossWeightDate) ? get_date_time_format($GrossWeightDate) : null; - $TareWtDt = !empty($TareWeightDate) ? get_date_time_format($TareWeightDate) : null; + $GrossWtDt = (!empty($GrossWeightDate) && (string)$GrossWeightDate != 'null' ) ? get_date_time_format($GrossWeightDate) : null; + $TareWtDt =(!empty($TareWeightDate) && (string)$TareWeightDate != 'null') ? get_date_time_format($TareWeightDate) : null; $path = ROOTPATH.'public/uploads/Igrfiles/'; @@ -1521,4 +1635,44 @@ function updateIGRWeight(){ } } } + public function downloadFilesAsZip($igrno) + { + + // Get all file details for the given IGR number + $fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrno); + if (empty($fileDetails)) { + // Display an alert message + echo ''; + return; + } + + // Define the root path for files + $rootPath = ROOTPATH . 'public/uploads/Igrfiles/'; + + // Create a new ZIP archive + $zip = new ZipArchive(); + + // Define the name of the ZIP file + $zipFileName = $igrno . '.zip'; + $zipFilePath = ROOTPATH . 'public/uploads/Igrfiles/' . $zipFileName; + + if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === TRUE) { + // Add each file to the ZIP archive + foreach ($fileDetails as $file) { + $filePath = $rootPath . $file->file; + if (file_exists($filePath)) { + $zip->addFile($filePath, $file->filename); + } + } + + // Close the ZIP archive + $zip->close(); + + // Return the ZIP file as a download + return $this->response->download($zipFilePath, null)->setFileName($zipFileName); + } else { + // Handle the error + echo 'Failed to create ZIP file'; + } + } } diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 400cc159..1fdc17ce 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -40,21 +40,14 @@ class Inwardgateregister_model extends Model $afftectedRows = $this->db->affectedRows(); return $afftectedRows; } - - - function getfies($igr) - { - + function getAdditionalIGRFile($igr){ $builder = $this->db->table('t_inwardgateregister_fileupload')->select('*') - - ->where('IGRNO', $igr); - + ->where('IGRNO', $igr); $query = $builder->get(); - return $query->getResult(); } - function fileupload($myfiles) + function uploadAdditionalFile($myfiles) { $builder = $this->db->table('t_inwardgateregister_fileupload'); $builder->insert($myfiles); @@ -62,13 +55,14 @@ class Inwardgateregister_model extends Model return $aff > 0 ? $this->db->insertID() : 0; } - function deleteBillFile($billno) + function deleteAdditionalFile($fileid) { - $deleteBillFile = array('Isactive' => 0); + $arr = array('Isactive' => 0); $this->db->table('t_inwardgateregister_fileupload') - ->where('BillNo', $billno) - ->update($deleteBillFile); - return TRUE; + ->where('BillNo', $fileid) + ->update($arr); + $aff = $this->db->affectedRows(); + return $aff > 0 ? true : false; } @@ -266,9 +260,7 @@ class Inwardgateregister_model extends Model $builder = $this->db->table('t_igr_details'); $builder->insert($igrD); $aff_row = $this->db->affectedRows(); - log_message('error', 'addigrD Query: ' . $this->db->getLastQuery()->getQuery()); - - + log_message('error', 'addigrD Query: ' . $this->db->getLastQuery()->getQuery()); $this->db->transComplete(); $result = $this->db->table('t_igr_details') @@ -277,7 +269,7 @@ class Inwardgateregister_model extends Model ->get() ->getRow(); - $res = ($aff_row && $result !== null) ? $result->IGRItemNo : 0; + $res = ($aff_row > 0) ? $result->IGRItemNo : 0; return $res; } @@ -414,7 +406,7 @@ class Inwardgateregister_model extends Model } } - function UpdatePOMaster($PONO, $updatedBy) + function UpdatePOMaster($PONO, $updatedBy,$IGRStatus) { $builder = $this->db->table('t_purchaseorder_lineitem')->select('*') @@ -425,7 +417,7 @@ class Inwardgateregister_model extends Model if ($query->getNumRows() == 0) { - $POStatus = array('status' => IGR_CREATED, 'UpdateBY' => $updatedBy); + $POStatus = array('status' => $IGRStatus, 'UpdateBY' => $updatedBy); $this->db->table('t_purchaseorder_master') ->where('PONO', $PONO) ->update($POStatus); @@ -933,5 +925,38 @@ class Inwardgateregister_model extends Model } + public function getAllIgrFileDetails($igrno) + { + + // Query 1: Get FilePath and Remarks from t_inwardgateregister_fileupload + $builder1 = $this->db->table('t_inwardgateregister_fileupload IFU'); + $query1 = $builder1->select('IFU.FilePath as file, IFU.Remarks as filename') + ->where('IFU.IGRNO', $igrno) + ->where('IFU.Isactive', 1) + ->get(); + $result1 = $query1->getResult(); + + // Query 2: Get MasterFile from t_igr_master + $builder2 = $this->db->table('t_igr_master IM'); + $query2 = $builder2->select('IM.MasterFile as file, IM.MasterFile as filename') + ->where('IM.IGRNO', $igrno) + ->where('IM.MasterFile IS NOT NULL') + ->get(); + $result2 = $query2->getResult(); + + // Query 3: Get WeightFile from t_igr_details + $builder3 = $this->db->table('t_igr_details ID'); + $query3 = $builder3->select('ID.WeightFile as file, ID.WeightFile as filename') + ->where('ID.IGRNO', $igrno) + ->where('ID.WeightFile IS NOT NULL') + ->get(); + $result3 = $query3->getResult(); + + // Merging results into a single array + $results = array_merge($result1, $result2, $result3); + + return $results; + } + } \ No newline at end of file diff --git a/app/Models/Requistion_model.php b/app/Models/Requistion_model.php index dce025d3..d8891486 100644 --- a/app/Models/Requistion_model.php +++ b/app/Models/Requistion_model.php @@ -124,8 +124,9 @@ class Requistion_model extends Model { $builder = $this->db->table('t_costcenter_master Mast ') ->select('Mast.CostCenterCode,Mast.CostCenterName') - ->join('t_costcenter_departments COST', 'COST.CostCenterCode = Mast.CostCenterCode') - ->where('COST.DEPCode ',$DeptId ); + ->where('Mast.IsActive ',1 ); + // ->join('t_costcenter_departments COST', 'COST.CostCenterCode = Mast.CostCenterCode','left') + // ->where('COST.DEPCode ',$DeptId ); $query = $builder->get(); return $query->getResultArray(); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index a5cdd7ca..5ecf7ae4 100644 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -3224,7 +3224,7 @@ if (!empty($INRSYMBOL)) {
-
+
- -
+
-
+
-
@@ -3333,6 +3331,7 @@ if (!empty($INRSYMBOL)) {
+
@@ -3372,29 +3371,9 @@ if (!empty($INRSYMBOL)) { ?>
- - -
- -
- 'RevenueEditCgst', 'value' => set_value('RevenueEditCgst', 0), 'id' => 'RevenueEditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();'); - echo form_input($data); - ?> -
-
-
- -
- 'RevenueEditAfterCgst', 'value' => set_value('RevenueEditAfterCgst', 0), 'id' => 'RevenueEditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
+
@@ -3434,49 +3413,10 @@ if (!empty($INRSYMBOL)) { ?>
-
-
- -
- 'RevenueEditSgst', 'value' => set_value('RevenueEditSgst', 0), 'id' => 'RevenueEditSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();'); - echo form_input($data); - ?> -
-
-
- -
- 'RevenueEditAfterSgst', 'value' => set_value('RevenueEditAfterSgst', 0), 'id' => 'RevenueEditAfterSgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
- -
- 'RevenueEditIgst', 'value' => set_value('RevenueEditIgst', 0), 'id' => 'RevenueEditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()'); - echo form_input($data); - ?> -
-
-
- -
- 'RevenueEditAfterIgst', 'value' => set_value('RevenueEditAfterIgst', 0), 'id' => 'RevenueEditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
+
+
+ + + +
+
+
+
+
+ +
+ 'RevenueEditCgst', 'value' => set_value('RevenueEditCgst', 0), 'id' => 'RevenueEditCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();'); + echo form_input($data); + ?> +
+
+
+ +
+ 'RevenueEditAfterCgst', 'value' => set_value('RevenueEditAfterCgst', 0), 'id' => 'RevenueEditAfterCgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+
+
+
+ +
+ 'RevenueEditSgst', 'value' => set_value('RevenueEditSgst', 0), 'id' => 'RevenueEditSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange();'); + echo form_input($data); + ?> +
+
+
+ +
+ 'RevenueEditAfterSgst', 'value' => set_value('RevenueEditAfterSgst', 0), 'id' => 'RevenueEditAfterSgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+ +
+ 'RevenueEditIgst', 'value' => set_value('RevenueEditIgst', 0), 'id' => 'RevenueEditIgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Editchange()'); + echo form_input($data); + ?> +
+
+
+ +
+ 'RevenueEditAfterIgst', 'value' => set_value('RevenueEditAfterIgst', 0), 'id' => 'RevenueEditAfterIgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
@@ -3535,11 +3549,11 @@ if (!empty($INRSYMBOL)) { ?>
- -
+
- +
+
@@ -3663,9 +3677,10 @@ if (!empty($INRSYMBOL)) {
-
+
+
@@ -3705,29 +3720,9 @@ if (!empty($INRSYMBOL)) { ?>
- -
- -
- 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();'); - echo form_input($data); - ?> -
-
-
- -
- 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
+
@@ -3767,50 +3762,10 @@ if (!empty($INRSYMBOL)) { ?>
-
-
- -
- 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); - echo form_input($data); - ?> -
-
-
- -
- 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true'); - echo form_input($data); - ?> -
-
-
-
-
-
+
+
-
@@ -3859,6 +3813,79 @@ if (!empty($INRSYMBOL)) { ?>
+
+ +
+
+
+ +
+ 'RevenueCgst', 'value' => set_value('RevenueCgst', 0), 'id' => 'RevenueCgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change();RevenueChangeSgst();'); + echo form_input($data); + ?> +
+
+
+ +
+ 'RevenueAfterCgst', 'value' => set_value('RevenueAfterCgst', 0), 'id' => 'RevenueAfterCgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+
+
+ +
+ 'RevenueSgst', 'value' => set_value('RevenueSgst', 0), 'id' => 'RevenueSgst', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'change()'); + echo form_input($data); + ?> +
+
+
+ +
+ 'RevenueAfterSgst', 'value' => set_value('RevenueAfterSgst', 0), 'id' => 'RevenueAfterSgst', 'class' => 'form-control num', 'readonly' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ +
+ +
+
+
@@ -3868,13 +3895,11 @@ if (!empty($INRSYMBOL)) { ?>
- - -
- +
+
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index de528ad2..8483b2cc 100644 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -2477,7 +2477,7 @@ <%=TotalValue%> -     +     diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index dd0b5526..5fa92d34 100644 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -2243,7 +2243,7 @@ <%=TotalValue%> -     +     diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 093c00d3..2c9be165 100644 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -2081,7 +2081,7 @@ if (!empty($INRSYMBOL)) { <%=TotalValue%> -     +     diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index ddd9d371..f9d9a4bb 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -127,21 +127,21 @@
'InvoiceNo', 'value' => set_value('InvoiceNo'), 'id' => 'InvoiceNo', 'class' => 'form-control', 'required=>"true"'); // ,'onkeypress'=>'return isNumberKey(event);' ); + $data = array('name' => 'InvoiceNo', 'value' => set_value('InvoiceNo'), 'id' => 'InvoiceNo', 'class' => 'form-control', 'required=>"true"', 'autocomplete'=>'off'); // ,'onkeypress'=>'return isNumberKey(event);' ); echo form_input($data); ?>
'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'InvoiceDate', 'class' => 'form-control num', 'required' => 'true'); + $data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'InvoiceDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete'=>'off'); echo form_input($data); ?>
'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control num', 'required' => 'true'); + $data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete'=>'off'); echo form_input($data); ?>
@@ -150,7 +150,7 @@
'VehicleNo', 'value' => set_value('VehicleNo'), 'id' => 'VehicleNo', 'class' => 'form-control', 'maxlength' => '20'); + $data = array('name' => 'VehicleNo', 'value' => set_value('VehicleNo'), 'id' => 'VehicleNo', 'class' => 'form-control', 'maxlength' => '20', 'autocomplete'=>'off'); echo form_input($data); ?> @@ -158,14 +158,14 @@
'DriverName', 'value' => set_value('DriverName'), 'id' => 'DriverName', 'class' => 'form-control', 'maxlength' => '50'); + $data = array('name' => 'DriverName', 'value' => set_value('DriverName'), 'id' => 'DriverName', 'class' => 'form-control', 'maxlength' => '50', 'autocomplete'=>'off'); echo form_input($data); ?>
'DriverMobileNumber', 'value' => set_value('DriverMobileNumber'), 'id' => 'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50'); + $data = array('name' => 'DriverMobileNumber', 'value' => set_value('DriverMobileNumber'), 'id' => 'DriverMobileNumber', 'class' => 'form-control', 'maxlength' => '50', 'autocomplete'=>'off'); echo form_input($data); ?>
@@ -206,7 +206,43 @@

- +
+
+
+ +
+ + $value) { ?> + +
+
+ File Name + +
+
+ + + +
+
+ +
+
+ + + +
+

+
+
@@ -267,7 +303,7 @@
'GrossWeight', 'value' => set_value('GrossWeight'), 'id' => 'GrossWeight', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'maxlength' => '50', 'onchange' => 'WeightDiffer(this);', 'placeholder' => 'Gross Weight Value (A)'); + $data = array('name' => 'GrossWeight', 'value' => set_value('GrossWeight'), 'id' => 'GrossWeight', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'maxlength' => '50', 'onchange' => 'WeightDiffer(this);', 'placeholder' => 'Gross Weight Value (A)', 'autocomplete'=>"off"); echo form_input($data); ?>
@@ -283,7 +319,7 @@
'TareWeight', 'value' => set_value('TareWeight'), 'id' => 'TareWeight', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'maxlength' => '50', 'onchange' => 'validateTareWeight(this);', 'placeholder' => 'Enter your username', 'placeholder' => 'Tare Weight Value (B)'); + $data = array('name' => 'TareWeight', 'value' => set_value('TareWeight'), 'id' => 'TareWeight', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'maxlength' => '50', 'onchange' => 'validateTareWeight(this);', 'autocomplete' => 'off', 'placeholder' => 'Tare Weight Value (B)', 'autocomplete'=>"off"); echo form_input($data); ?>
@@ -325,15 +361,8 @@
- - - - -
- -
@@ -348,7 +377,8 @@ @@ -818,4 +857,42 @@ console.log("Saving values for index: " + inx + " undefined"); } } + + \ No newline at end of file diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php index 848e3948..b27c03f0 100644 --- a/app/Views/requisitionlisting.php +++ b/app/Views/requisitionlisting.php @@ -111,6 +111,7 @@ span.highlight { Partially PoCreatedLineItem NewLine Item Status + Requested By Action @@ -133,14 +134,12 @@ span.highlight { ReqNo ?> ReqType ?> TotalNoofLineItems ?> - PolineItems ?> - PartilallyLineItems ?> - newLineItem ?> - - + PolineItems ?> + PartilallyLineItems ?> + newLineItem ?> StatusName ?> - -     + Requestedby ?> +     format('d-m-Y'); ?> VehicleNo ?> IGRStatus == 'ST074' ? 'Draft' : 'Completed'; ?> - FilePath)) { ?> - + + + + +   + FilePath)) { ?> + file)) { ?> - + - +   @@ -147,6 +152,8 @@ ?>
+ +
@@ -222,7 +229,7 @@ -
+
@@ -230,14 +237,25 @@
- -
- Close - Draft IGR - Generate IGR + +
+
+ +
+ +
+
+

+
+
+ Close + Save as Draft IGR + Generate IGR +
- -
@@ -423,8 +441,6 @@
- -
@@ -512,11 +528,13 @@ // success:function(data) { $('#content').loader('hide'); var parsedData = JSON.parse(data); - if (parsedData.length === 0) { +console.log(parsedData); + if (parsedData['details'].length === 0) { console.log("No data available"); // Reset all relevant fields and table $('#IgrshowTitle').text(''); $("#IGRNO1").val(''); + $("#PONO1").val(''); $("#txtIGRLineItem").val(''); $('#printLink').attr('href', '#'); $('.help-block').text(''); @@ -540,11 +558,12 @@ var trIGRHTML = ''; - $.each(parsedData, function(i, item) { + $.each(parsedData['details'], function(i, item) { if (igr == item.IGRNO) { console.log(item); $('#IgrshowTitle').text(" ( " + item.IGRNO + " ) "); $("#IGRNO1").val(item.IGRNO); + $("#PONO1").val(item.PONO); $("#txtIGRLineItem").val(item.IGRItemNo); var baseUrl = 'purchaseorder/CreatePOPrint'; var newUrl = baseUrl + '?PONO=' + item.PONO + '&ReqType=' + item.POType; @@ -650,6 +669,11 @@ $("#tbleIGRAppend").empty(); $("#tbleIGRAppend").append(trIGRHTML); + if (parsedData['files'].length !== 0) { + $.each(parsedData['files'], function(i, item) { + appendExistingFilesFileds(item) + }); + } } }); }); @@ -675,6 +699,7 @@ $('#draftIGR').click(function(){ $('#content').loader('show'); var igrno = $("#IGRNO1").val(); + var pono = $("#PONO1").val(); var status = 0; var tableData = []; $('#tbleIGRAppend tr').each(function(index) { @@ -694,8 +719,12 @@ }; tableData.push(rowData); }); + var formData = new FormData(); + // file_name[] + // emp_file[] formData.append('igr', igrno); + formData.append('po', pono); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); @@ -704,6 +733,16 @@ formData.append('status', status); formData.append('tableData', JSON.stringify(tableData)); formData.append('MasterFile', $('#MasterFile')[0].files[0]); + formData.append('file_name[]', $('#file_name').val()); + var empFiles = $('#emp_file')[0] ? $('#emp_file')[0].files : null; + if (empFiles) { + for (var i = 0; i < empFiles.length; i++) { + formData.append('emp_file[]', empFiles[i]); + console.log(empFiles[i]); + } + }else{ + console.log("ajax call"); + } $.ajax({ data: formData, type: "POST", @@ -720,6 +759,7 @@ $('#generateIGR').click(function(){ $('#content').loader('show'); var igrno = $("#IGRNO1").val(); + var pono = $("#PONO1").val(); var status = 1; var tableData = []; $('#tbleIGRAppend tr').each(function(index) { @@ -741,6 +781,7 @@ }); var formData = new FormData(); formData.append('igr', igrno); + formData.append('po', pono); formData.append('mrc', $("#MaterialRcvdDate").val()); formData.append('invdate', $("#Invoice_Date").val()); formData.append('vehicle_no', $('#Vehicle_No').val()); @@ -749,7 +790,16 @@ formData.append('status', status); formData.append('tableData', JSON.stringify(tableData)); formData.append('MasterFile', $('#MasterFile')[0].files[0]); - + formData.append('file_name[]', $('#file_name').val()); + var empFiles = $('#emp_file')[0] ? $('#emp_file')[0].files : null; + if (empFiles) { + for (var i = 0; i < empFiles.length; i++) { + formData.append('emp_file[]', empFiles[i]); + console.log(empFiles[i]); + } + }else{ + console.log("ajax call"); + } $.ajax({ data: formData, type:"POST", @@ -1023,10 +1073,10 @@ $("#hidebillno").val(Billno); function deleteBill(Billno,i){ $.ajax({ data: { - Billno: Billno, + id: Billno, }, type: "POST", - url: "deleteBillFile", + url: "deleteAdditionalFile", success: function(data) { if (data) { alert(data); @@ -1498,4 +1548,100 @@ $(document).ready(function() { .dataTables_wrapper .col-sm-3 .dt-buttons { float: right; } - \ No newline at end of file + + \ No newline at end of file diff --git a/public/uploads/POfiles/SECLIENT.jpg b/public/uploads/POfiles/SECLIENT.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c67d3006ea9c0144524ecc7d2848154a36c238bd GIT binary patch literal 11487 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 literal 0 HcmV?d00001 diff --git a/public/uploads/POfiles/SupplierBills.png b/public/uploads/POfiles/SupplierBills.png new file mode 100644 index 0000000000000000000000000000000000000000..19bc537aba8f41352e60597b06839c332c18fc04 GIT binary patch literal 2512 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 literal 0 HcmV?d00001 diff --git a/public/uploads/POfiles/WorkPlace2_1.jpeg b/public/uploads/POfiles/WorkPlace2_1.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..7e95610771019aadeba3a7327d715ee6e0947e77 GIT binary patch literal 6399 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 literal 0 HcmV?d00001 diff --git a/public/uploads/POfiles/WorkPlace2_2.jpeg b/public/uploads/POfiles/WorkPlace2_2.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..7e95610771019aadeba3a7327d715ee6e0947e77 GIT binary patch literal 6399 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 literal 0 HcmV?d00001 diff --git a/public/uploads/POfiles/WorkPlace3.jpeg b/public/uploads/POfiles/WorkPlace3.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..07259d7b2093697bd29926f09b83dbf26cb36cbe GIT binary patch literal 8933 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 LOCAL_Loan_Amount) THEN + + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Advance=LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Advance; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + + + END IF; + + ELSE IF (LOCAL_Manual_due = 0) THEN + IF (LOCAL_Monthly_due <= LOCAL_Loan_Amount) THEN + + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Monthly_due; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Monthly_due; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + SET LOCAL_Advance=LOCAL_Monthly_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Advance; + + ELSEIF(LOCAL_Monthly_due >= LOCAL_Loan_Amount) THEN + + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Advance=LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Advance; + + + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Loan_Amount; + + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + + + END IF; + END IF; + END IF; + + ELSEIF((LOCAL_Remaing_Due = LOCAL_No_of_dues) AND (LOCAL_Paid_Due = 0) AND (LOCAL_Due_start_date = P_PayOn)) THEN + + IF (LOCAL_Manual_due != 0) THEN + + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Manual_due; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Manual_due; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + SET LOCAL_Advance=LOCAL_Manual_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Advance; + + ELSE + + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Monthly_due; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Monthly_due; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + SET LOCAL_Advance=LOCAL_Monthly_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Advance; + + END IF; + + END IF; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + ELSE + + SELECT Advance INTO LOCAL_LAST_INSERTED_DUE FROM t_payroll WHERE PayOn = P_PayOn AND EmpID = EmployeeID; + IF (LOCAL_LAST_INSERTED_DUE = LOCAL_Monthly_due) THEN + IF (LOCAL_Manual_due = 0) THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Monthly_due; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + ELSEIF (LOCAL_Manual_due != 0) THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + IF (LOCAL_Manual_due >= LOCAL_Loan_Amount) THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Loan_Amount; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + + + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + + SET LOCAL_LAST_INSERTED_DUE=LOCAL_Loan_Amount; + ELSEIF(LOCAL_Manual_due <= LOCAL_Loan_Amount) THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Manual_due; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Manual_due; + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Manual_due; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + SET LOCAL_LAST_INSERTED_DUE=LOCAL_Manual_due; + + + END IF; + END IF; + ELSEIF((LOCAL_LAST_INSERTED_DUE != LOCAL_Monthly_due) AND (LOCAL_LAST_INSERTED_DUE != 0))THEN + IF (LOCAL_Manual_due != 0) THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + IF (LOCAL_Manual_due >= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Loan_Amount; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Loan_Amount; + ELSEIF(LOCAL_Manual_due <= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Manual_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Manual_due; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Manual_due; + SET LOCAL_BalancedAdvance=LOCAL_Manual_due; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Manual_due; + END IF; + ELSEIF(LOCAL_Manual_due = 0)THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + IF (LOCAL_Monthly_due >= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Loan_Amount; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Loan_Amount; + ELSEIF(LOCAL_Monthly_due <= LOCAL_Loan_Amount) THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Monthly_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Monthly_due; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Monthly_due; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Monthly_due; + END IF; + END IF; + ELSEIF((LOCAL_LAST_INSERTED_DUE != LOCAL_Monthly_due) AND (LOCAL_LAST_INSERTED_DUE = 0))THEN + IF (LOCAL_Manual_due != 0) THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + IF(LOCAL_Manual_due >= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Loan_Amount; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Loan_Amount; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + ELSEIF(LOCAL_Manual_due <= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Manual_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Manual_due; + SET LOCAL_Loan_Amount=LOCAL_Loan_Amount - LOCAL_Manual_due; + SET LOCAL_BalancedAdvance=LOCAL_Manual_due; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Manual_due; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + END IF; + ELSEIF(LOCAL_Manual_due = 0)THEN + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + IF (LOCAL_No_of_dues != LOCAL_Remaing_Due) THEN + IF(LOCAL_Monthly_due >= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Loan_Amount; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Loan_Amount; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Loan_Amount; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount ; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Loan_Amount; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + ELSEIF(LOCAL_Monthly_due <= LOCAL_Loan_Amount)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary - LOCAL_Monthly_due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount + LOCAL_Monthly_due; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount - LOCAL_Monthly_due; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount ; + SET LOCAL_LAST_INSERTED_DUE = LOCAL_Monthly_due; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due - 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due + 1; + END IF; + ELSEIF(LOCAL_No_of_dues = LOCAL_Remaing_Due)THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount ; + SET LOCAL_LAST_INSERTED_DUE = 0.00; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due; + SET LOCAL_Paid_Due = LOCAL_Paid_Due; + END IF; + + END IF; + END IF; + END IF; + ELSE + + + SELECT Advance INTO LOCAL_LAST_INSERTED_DUE FROM t_payroll WHERE PayOn = P_PayOn AND EmpID = EmployeeID; + IF LOCAL_LAST_INSERTED_DUE != 0 THEN + SET LOCAL_TotalSalary = LOCAL_TotalSalary ; + SET LOCAL_Loan_Amount = LOCAL_Loan_Amount + LOCAL_LAST_INSERTED_DUE; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due + 1; + SET LOCAL_Paid_Due = LOCAL_Paid_Due - 1; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount - LOCAL_LAST_INSERTED_DUE; + SET LOCAL_LAST_INSERTED_DUE =0.00; + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + ELSEIF (LOCAL_LAST_INSERTED_DUE = 0 OR LOCAL_LAST_INSERTED_DUE = '' ) THEN + SET LOCAL_BalancedAdvance=LOCAL_Loan_Amount; + SET LOCAL_TotalSalary = LOCAL_TotalSalary ; + SET LOCAL_Remaing_Due = LOCAL_Remaing_Due; + SET LOCAL_Paid_Due = LOCAL_Paid_Due; + SET LOCAL_Paid_Amount=LOCAL_Paid_Amount; + SET LOCAL_LAST_INSERTED_DUE =0.00; + END IF; + +END IF; +ELSE + + + + + + + + + SET LOCAL_is_Active = 0; + +END IF; +END IF; + + + + + + +SELECT + BankAccountNo, PFNO, ESI, UANO +INTO LOCAL_BankAccountNumber , LOCAL_PFNumber , LOCAL_ESINumber , LOCAL_UANNO FROM + t_employee_details +WHERE + EmpID = EmployeeID; + +SELECT + PayOn, EmpID +INTO LOCAL_PayOn , LOCAL_EmpID FROM + t_payroll +WHERE + PayOn = P_PayOn AND EmpID = EmployeeID; + + SET LOCAL_lessAdvance= LOCAL_TotalSalary; + + + + SET DCOUNT=(SELECT COUNT(*) FROM t_payroll WHERE PayOn=P_PayOn AND EmpID=EmployeeID); + IF DCOUNT >0 THEN + + UPDATE t_payroll SET NoofDaysWorked=LOCAL_NoofDaysWorked,LOP=LOCAL_LOP,ActualSalary=LOCAL_ActualSalary,PerDaySalary=LOCAL_PerDaySalary,WorkedSalary=LOCAL_WorkedSalary,BasicPlusDA=LOCAL_BasicPlusDA,HRA=LOCAL_HRA_WORKED,OTWages=LOCAL_OTWages,OTperHours=LOCAL_OTperHours,OTSalary=LOCAL_OTSalary,ESIGrossSalary=LOCAL_ESIGrossSalary,EmployeeESI=LOCAL_EmployeeESI,PF=LOCAL_PF,OtherDeductions=LOCAL_OTHER_DEDUCTIONS,TotalDeduction=LOCAL_TotalDeduction,SalaryAsPerPF=LOCAL_SalaryAsPerPF,FoodAllowance=LOCAL_FoodAllowance,Incentive=LOCAL_Incentive,TotalSalary=LOCAL_TotalSalary,Advance=LOCAL_LAST_INSERTED_DUE,BalanceAdvance=LOCAL_BalancedAdvance,LessAdvance=LOCAL_lessAdvance,Other_allowances=LOCAL_ALLOWANCES,Remarks='Updated Payroll',BankAccountNumber=LOCAL_BankAccountNumber,PFNumber=LOCAL_PFNumber,ESINumber=LOCAL_ESINumber,UANNO=LOCAL_UANNO WHERE PayOn=P_PayOn AND EmpID=EmployeeID; + UPDATE t_loan_master SET Paid_Due=LOCAL_Paid_Due,Remaining_Due=LOCAL_Remaing_Due,Paid_Amount=LOCAL_Paid_Amount WHERE EmpID = EmployeeID; + + ELSE + + IF (LOCAL_Initial_Loan_Amount = LOCAL_Paid_Amount)THEN + SET LOCAL_is_Active = 0; + END IF; + + + UPDATE t_loan_master SET Loan_Amount=LOCAL_Initial_Loan_Amount,Loan_Issued_Date=LOCAL_Loan_issued_on,Paid_Due=LOCAL_Paid_Due,Remaining_Due=LOCAL_Remaing_Due,Monthly_Due=LOCAL_Monthly_due,Due_Start_Date=LOCAL_Due_start_date1,No_of_Dues=LOCAL_No_of_dues,Paid_Amount=LOCAL_Paid_Amount,is_Active=LOCAL_is_Active WHERE EmpID = EmployeeID AND Loan_ID = LOCAL_Loan_ID; + + IF ((LOCAL_Loan_ID > 0) AND (LOCAL_Manual_due != 'NA'))THEN + INSERT INTO t_loan_history (Loan_ID,Due_Amount,Balance_Amount,Due_Date) VALUES(LOCAL_Loan_ID,LOCAL_Advance,LOCAL_BalancedAdvance,P_PayOn); + END IF; + + + INSERT INTO t_payroll(PayOn,EmpID,TotalCalDays,NoofDaysWorked,LOP,Paid_Leave,ActualSalary,PerDaySalary,WorkedSalary,BasicPlusDA,HRA,OTWages,OTperHours,OTSalary,ESIGrossSalary,EmployeeESI,PF,CompanyESI,CompanyPF,TotalCompCon,OtherDeductions,TotalDeduction,SalaryAsPerPF,FoodAllowance,Incentive,Festival_Bonus,TotalSalary,Advance,BalanceAdvance,LessAdvance,Other_allowances + ,Remarks,BankAccountNumber,PFNumber,ESINumber,UANNO) VALUES (P_PayOn,EmployeeID,LOCAL_MONTH_DAYS,LOCAL_NoofDaysWorked,LOCAL_LOP,LOCAL_Paid,LOCAL_ActualSalary,LOCAL_PerDaySalary,LOCAL_WorkedSalary,LOCAL_BasicPlusDA,LOCAL_HRA_WORKED,LOCAL_OTWages,LOCAL_OTperHours,LOCAL_OTSalary,LOCAL_ESIGrossSalary,LOCAL_EmployeeESI,LOCAL_PF,LOCAL_CompanyESI,LOCAL_CompanyPF,LOCAL_TotalCompCon,LOCAL_OTHER_DEDUCTIONS,LOCAL_TotalDeduction,LOCAL_SalaryAsPerPF,LOCAL_FoodAllowance,LOCAL_Incentive,LOCAL_FestivalBonus,LOCAL_TotalSalary,LOCAL_Advance,LOCAL_BalancedAdvance,LOCAL_lessAdvance,LOCAL_ALLOWANCES,'REMARKS for PAYROLL(SP)',LOCAL_BankAccountNumber,LOCAL_PFNumber,LOCAL_ESINumber,LOCAL_UANNO); + + + + + END IF; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_GET_AllPOCREATION*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_GET_AllPOCREATION`(IN `USER_ID` VARCHAR(20)) + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE Total_COUNT VARCHAR(10); + DECLARE Po_COUNT VARCHAR(10); + DECLARE Partial_COUNT VARCHAR(10); + DECLARE ReqList CURSOR FOR Select ReqNo from POCREATIONLIST; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + DROP table IF EXISTS POCREATIONLIST; + CREATE TEMPORARY TABLE POCREATIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,TotalNoofLineItems varchar(20) null,PolineItems varchar(20), + PartilallyLineItems varchar(20) null,newLineItem varchar(20) null + ) ENGINE=MEMORY AS ( + select Mast.ReqNo,Mast.Requestedby,Mast.ReqType,Mast.Status,Mast.CreatedDate,Line.Materialcode,St.StatusName +from t_requestion_master as Mast +join t_requestion_details Line on Line.ReqNo = Mast.ReqNo +join t_status St on St.StatusCode = Mast.Status where Requestedby in (select EmpID from tbl_users where userId=USER_ID)); + +OPEN ReqList; + ReqList_loop: LOOP + FETCH ReqList INTO REQ_NO; + +SELECT count(*) as count INTO Total_COUNT from POCREATIONLIST WHERE ReqNo=REQ_NO ; +SELECT count(*) as count INTO Po_COUNT from POCREATIONLIST WHERE ReqNo=REQ_NO and status in ('ST022','ST049','ST050') ; +SELECT count(*) as count INTO Partial_COUNT from POCREATIONLIST WHERE ReqNo=REQ_NO and status ='ST023' ; +SELECT count(*) as count INTO LOCAL_COUNT from POCREATIONLIST WHERE ReqNo=REQ_NO and status ='ST003' ; + + + +update POCREATIONLIST set TotalNoofLineItems=Total_COUNT ,PolineItems=Po_COUNT, PartilallyLineItems= Partial_COUNT, +newLineItem=LOCAL_COUNT where ReqNo= REQ_NO; + +IF exit_loop THEN + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; + +CLOSE ReqList; + +select * from POCREATIONLIST; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_GET_AllREQUISTION*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_GET_AllREQUISTION`(IN `USER_ID` VARCHAR(20)) + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE Total_COUNT VARCHAR(10); + DECLARE Po_COUNT VARCHAR(10); + DECLARE Partial_COUNT VARCHAR(10); + DECLARE ReqList CURSOR FOR Select ReqNo from POREQUISTIONLIST; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + DROP table IF EXISTS POREQUISTIONLIST; + CREATE TEMPORARY TABLE POREQUISTIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,TotalNoofLineItems varchar(20) null,PolineItems varchar(20), + PartilallyLineItems varchar(20) null,newLineItem varchar(20) null + ) ENGINE=MEMORY AS ( + select distinct Mast.ReqNo,Mast.Requestedby,Mast.ReqType,Mast.Status,Mast.CreatedDate,St.StatusName +from t_requestion_master as Mast +join t_requestion_details Line on Line.ReqNo = Mast.ReqNo +join t_status St on St.StatusCode = Mast.Status where Requestedby in +(select EmpID from tbl_users where userId=USER_ID)); + + + +DROP table IF EXISTS POTEMP; + CREATE TEMPORARY TABLE POTEMP ( + ID INT NOT NULL auto_increment PRIMARY KEY + ) ENGINE=MEMORY AS ( +select Line.ReqNo,Mast.Requestedby,Mast.ReqType,Line.Status,Mast.CreatedDate,St.StatusName +from t_requestion_master as Mast +join t_requestion_details Line on Line.ReqNo = Mast.ReqNo +join t_status St on St.StatusCode = Mast.Status where Requestedby in +(select EmpID from tbl_users where userId=USER_ID)); + +OPEN ReqList; + ReqList_loop: LOOP + FETCH ReqList INTO REQ_NO; + +SELECT count(*) as count INTO Total_COUNT from POTEMP WHERE ReqNo=REQ_NO ; +SELECT count(*) as count INTO Po_COUNT from POTEMP WHERE ReqNo=REQ_NO and status ='ST022' ; +SELECT count(*) as count INTO Partial_COUNT from POTEMP WHERE ReqNo=REQ_NO and status ='ST023' ; +SELECT count(*) as count INTO LOCAL_COUNT from POTEMP WHERE ReqNo=REQ_NO and status ='ST003' ; + + + +update POREQUISTIONLIST set TotalNoofLineItems=Total_COUNT ,PolineItems=Po_COUNT, PartilallyLineItems= Partial_COUNT, +newLineItem=LOCAL_COUNT where ReqNo= REQ_NO; + +IF exit_loop THEN + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; + +CLOSE ReqList; + +select distinct ReqNo,Requestedby,ReqType,Status,CreatedDate,StatusName,TotalNoofLineItems, PolineItems,PartilallyLineItems,newLineItem from POREQUISTIONLIST; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_GET_AllSTOREREQUISTION*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_GET_AllSTOREREQUISTION`(IN `USER_ID` VARCHAR(20)) + NO SQL +BEGIN + DECLARE STOREREQ_NO VARCHAR(10); + DECLARE exit_loop BOOLEAN; + DECLARE Total_COUNT int; + DECLARE Pending_COUNT int; + DECLARE Issue_COUNT int; + DECLARE ReqList CURSOR FOR Select StoreReqNo from STOREREQUISTIONLIST; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + DROP table IF EXISTS STOREREQUISTIONLIST; + CREATE TEMPORARY TABLE STOREREQUISTIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,TotalNoofLineItems varchar(20) null,PendingItems varchar(20) null, IssuesItems varchar(20) null + ) ENGINE=MEMORY AS ( + select distinct Str.StoreReqNo,Str.Requestedby,Str.ReqDate,Str.Status,Str.Comments as Remarks,St.StatusName from t_store_requestion_Master Str + join t_store_requestion_details De on De.StoreReqNo = Str.StoreReqNo + join t_status St on St.StatusCode = Str.Status + join tbl_users Us on Us.userId =Str.CreatedBy + where Us.userId=USER_ID); + + + + + + + + + +OPEN ReqList; +ReqList_loop: LOOP +FETCH ReqList INTO STOREREQ_NO; + +SELECT count(*) as count INTO Total_COUNT from t_store_requestion_details WHERE StoreReqNo=STOREREQ_NO ; +SELECT count(*) as count INTO Pending_COUNT from t_store_requestion_details WHERE StoreReqNo=STOREREQ_NO and status ='ST034' ; +SELECT count(*) as count INTO Issue_COUNT from t_store_requestion_details WHERE StoreReqNo=STOREREQ_NO and status ='ST037' ; + + +update STOREREQUISTIONLIST set TotalNoofLineItems = Total_COUNT ,PendingItems=Pending_COUNT, IssuesItems =Issue_COUNT + where StoreReqNo= STOREREQ_NO; + +IF exit_loop THEN + + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; +CLOSE ReqList; +select * from STOREREQUISTIONLIST; +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_GET_REQUISTIONLIST*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_GET_REQUISTIONLIST`(IN `REQNO` VARCHAR(20)) + NO SQL +BEGIN + + + DROP table IF EXISTS POREQUISTIONLIST; + DROP table IF EXISTS PARTIALPOREQUISTIONLIST; + + CREATE TEMPORARY TABLE POREQUISTIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY + ) ENGINE=MEMORY AS ( + SELECT ReqNo, Req.MaterialCode, MaterialName, + UOM, Req.Quantity FROM t_requestion_details Req + JOIN t_materialmaster mat ON Req.MaterialCode = mat.MaterialCode + WHERE Req.ReqNo IN (REQNO) + and Req.status not in('ST022','ST023','ST049','ST050','ST053')); + + + CREATE TEMPORARY TABLE PARTIALPOREQUISTIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY + ) ENGINE=MEMORY AS ( + SELECT distinct Req.ReqNo, Req.MaterialCode, MaterialName, + UOM, (Req.Quantity - Line.Quantity) as Quantity FROM t_requestion_details Req + left JOIN t_materialmaster mat ON Req.MaterialCode = mat.MaterialCode + left join t_purchaseorder_lineItem Line on Line.ReqNo = Req.ReqNo and Line.MaterialCode = Req.MaterialCode + WHERE Req.ReqNo IN (REQNO) + + and Req.status in('ST023')); + + + + SET @strSearchSQL = 'INSERT INTO POREQUISTIONLIST(ReqNo,MaterialCode,MaterialName,UOM,Quantity) SELECT ReqNo,MaterialCode,MaterialName,UOM,Quantity from PARTIALPOREQUISTIONLIST + '; + + PREPARE stmt FROM @strSearchSQL; + EXECUTE stmt; + DEALLOCATE PREPARE stmt; + + + + + + Select * from POREQUISTIONLIST; +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_GET_REQUISTITEMLIST*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_GET_REQUISTITEMLIST`(IN `REQ_NO1` VARCHAR(20)) + NO SQL +BEGIN + DECLARE Material_Code VARCHAR(10); + DECLARE exit_loop BOOLEAN; + DECLARE PO_Quantity VARCHAR(10); + DECLARE ReqsType VARCHAR(10); + + + DECLARE ReqList CURSOR FOR Select mcode from EDITREQUISTLIST; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + select trim(ReqType) as ReqType INTO ReqsType from t_requestion_master where ReqNo=trim(REQ_NO1); + + if ReqsType = 'SERVICE' then + + DROP table IF EXISTS MAINREQUISTLIST; + CREATE TEMPORARY TABLE MAINREQUISTLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY, + POQUANTITY varchar(20) null + + + ) ENGINE=MEMORY AS (select distinct Req.ItemNo,Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,Po.Quantity as + POQTY,sta.StatusName from t_materialmaster Mat join t_requestion_details Req on Req.MaterialCode = Mat.MaterialCode + left join t_purchaseorder_lineItem Po on Po.ReqNo = Req.ReqNo and Po.ItemNo = Req.ItemNo + left join t_status sta on sta.StatusCode = Req.Status + where Req.ReqNo = REQ_NO1); + + + DROP table IF EXISTS EDITREQUISTLIST; + CREATE TEMPORARY TABLE EDITREQUISTLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY + + ) ENGINE=MEMORY AS (select distinct Req.ItemNo as mcode,Req.ReqNo, Req.MaterialCode,Mat.MaterialName,Mat.UOM,Req.Quantity, Po.Quantity as POQuantity ,sta.StatusName + from t_requestion_details Req join t_materialmaster Mat on Req.MaterialCode = Mat.MaterialCode + left join t_purchaseorder_lineItem Po on Po.ReqNo = Req.ReqNo and Po.ItemNo = Req.ItemNo + left join t_purchaseorder_master POMast on POMast.PONO = Po.PONO + left join t_status sta on sta.StatusCode = Req.Status + where Req.ReqNo =REQ_NO1 + and INstr(Po.PONO,'.') <= 0 + group by Req.ItemNo); + + + OPEN ReqList; + ReqList_loop: LOOP + FETCH ReqList INTO Material_Code; + + + + + + + update MAINREQUISTLIST set POQUANTITY= (SELECT ifnull(POQuantity,0) from EDITREQUISTLIST WHERE mcode= Material_Code) + where ItemNo= Material_Code; + + + IF exit_loop THEN + LEAVE ReqList_loop; + END IF; + END LOOP ReqList_loop; + +CLOSE ReqList; + + +select distinct ItemNo,ReqNo, MaterialCode,MaterialName,UOM,Quantity,ifnull(POQUANTITY,0.00) as POQTY,StatusName from MAINREQUISTLIST; + +else + + DROP table IF EXISTS MAINREQUISTLIST; + CREATE TEMPORARY TABLE MAINREQUISTLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY, + POQUANTITY varchar(20) null + + + ) ENGINE=MEMORY AS (select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,Po.Quantity as POQTY,sta.StatusName from t_materialmaster Mat join t_requestion_details Req on Req.MaterialCode = Mat.MaterialCode + left join t_purchaseorder_lineItem Po on Po.ReqNo = Req.ReqNo + left join t_status sta on sta.StatusCode = Req.Status + where Req.ReqNo = REQ_NO1); + + + DROP table IF EXISTS EDITREQUISTLIST; + CREATE TEMPORARY TABLE EDITREQUISTLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY + + ) ENGINE=MEMORY AS (select distinct Req.ReqNo, Req.MaterialCode as mcode,Req.MaterialCode,Mat.MaterialName,Mat.UOM,Req.Quantity, sum(Po.Quantity) as POQuantity ,sta.StatusName + from t_requestion_details Req join t_materialmaster Mat on Req.MaterialCode = Mat.MaterialCode + left join t_purchaseorder_lineItem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode + left join t_purchaseorder_master POMast on POMast.PONO = Po.PONO + left join t_status sta on sta.StatusCode = Req.Status + where Req.ReqNo = REQ_NO1 and Req.Status in ('ST022','ST023','ST053') + and INstr(Po.PONO,'.') <= 0 + group by Req.MaterialCode); + + + OPEN ReqList; + ReqList_loop: LOOP + FETCH ReqList INTO Material_Code; + + + + + + + update MAINREQUISTLIST set POQUANTITY= (SELECT ifnull(POQuantity,0) from EDITREQUISTLIST WHERE MaterialCode= Material_Code) + where MaterialCode= Material_Code; + + + IF exit_loop THEN + LEAVE ReqList_loop; + END IF; + END LOOP ReqList_loop; + +CLOSE ReqList; + + +select distinct ReqNo, MaterialCode,MaterialName,UOM,Quantity,ifnull(POQUANTITY,0.00) as POQTY,StatusName from MAINREQUISTLIST; + +end if; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_PURCHASEORDER_DETAILS*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_PURCHASEORDER_DETAILS`() + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE Total_COUNT VARCHAR(10); + DECLARE Po_COUNT VARCHAR(10); + DECLARE Partial_COUNT VARCHAR(10); + DECLARE ReqList CURSOR FOR Select ReqNo from POCREATIONLIST; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + DROP table IF EXISTS POCREATIONLIST; + CREATE TEMPORARY TABLE POCREATIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,TotalNoofLineItems varchar(20) null,PolineItems varchar(20), + PartilallyLineItems varchar(20) null,newLineItem varchar(20) null + ) ENGINE=MEMORY AS ( + SELECT REQ.ReqNo,ReqType,Requestedby,EMP.FirstName,EMP.Designation, + STAT.StatusCode ,STAT.StatusName,ReqDate,DEPT.DEPCode,DEPT.DepartmentName + + + FROM t_requestion_master REQ + + JOIN t_employee_details EMP ON REQ.Requestedby = EMP.EmpID + JOIN t_departmentdetails DEPT ON EMP.Departmentcode = DEPT.DEPCode + JOIN t_status STAT on REQ.Status = STAT.StatusCode + where REQ.Status IN ('ST004','ST023')); + + DROP table IF EXISTS POTEMP; + CREATE TEMPORARY TABLE POTEMP ( + ID INT NOT NULL auto_increment PRIMARY KEY + ) ENGINE=MEMORY AS ( + SELECT REQ.ReqNo,ReqType,Requestedby,EMP.FirstName,EMP.Designation, + STAT.StatusCode ,STAT.StatusName,ReqDate,DEPT.DEPCode,DEPT.DepartmentName + ,ReqDetail.MaterialCode , + ReqDetail.Status + FROM t_requestion_master REQ + join t_requestion_details ReqDetail on REQ.ReqNo = ReqDetail.ReqNo + JOIN t_employee_details EMP ON REQ.Requestedby = EMP.EmpID + JOIN t_departmentdetails DEPT ON EMP.Departmentcode = DEPT.DEPCode + JOIN t_status STAT on REQ.Status = STAT.StatusCode + where REQ.Status IN ('ST004','ST023')); + +OPEN ReqList; + ReqList_loop: LOOP + FETCH ReqList INTO REQ_NO; + +SELECT count(*) as count INTO Total_COUNT from POTEMP WHERE ReqNo=REQ_NO ; +SELECT count(*) as count INTO Po_COUNT from POTEMP WHERE ReqNo=REQ_NO and Status in ('ST022','ST053','ST056') ; +SELECT count(*) as count INTO Partial_COUNT from POTEMP WHERE ReqNo=REQ_NO and Status ='ST023' ; +SELECT count(*) as count INTO LOCAL_COUNT from POTEMP WHERE ReqNo=REQ_NO and Status='ST003' ; + +SET SQL_SAFE_UPDATES = 0; +update POCREATIONLIST set TotalNoofLineItems=Total_COUNT ,PolineItems=Po_COUNT, PartilallyLineItems= Partial_COUNT, +newLineItem=LOCAL_COUNT where ReqNo= REQ_NO; + + IF exit_loop THEN + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; + +CLOSE ReqList; + +select * from POCREATIONLIST order by ReqDate desc ; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_REQUISTIONPOCOUNT*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_REQUISTIONPOCOUNT`(IN `REQNO` VARCHAR(20)) + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE Total_COUNT VARCHAR(10); + DECLARE Po_COUNT VARCHAR(10); + DECLARE Partial_COUNT VARCHAR(10); + + + + DROP table IF EXISTS POCREATIONLIST; + CREATE TEMPORARY TABLE POCREATIONLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,TotalNoofLineItems varchar(20) null,PolineItems varchar(20), + PartilallyLineItems varchar(20) null,newLineItem varchar(20) null + ) ENGINE=MEMORY AS ( + select ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,st.StatusName +from t_requestion_details Req join t_materialmaster Mat on +Req.MaterialCode = Mat.MaterialCode +join t_status st on st.StatusCode = Req.Status +where ReqNo=REQNO); + + + +select * from POCREATIONLIST; + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_UPDATE_REQUISTIONSTATUS*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_UPDATE_REQUISTIONSTATUS`() + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE Partial_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE ReqList CURSOR FOR Select ReqNo from t_requestion_master where status != 'ST024'; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + + + + +OPEN ReqList; +ReqList_loop: LOOP +FETCH ReqList INTO REQ_NO; + +SELECT count(*) as count INTO LOCAL_COUNT from t_requestion_details WHERE ReqNo=REQ_NO AND status !='ST022' ; +SELECT count(*) as cnt INTO Partial_COUNT from t_requestion_details WHERE ReqNo=REQ_NO AND status ='ST023' ; +if LOCAL_COUNT = 0 then + UPDATE t_requestion_master SET status='ST005' WHERE ReqNo=REQ_NO; + +end if; + + if Partial_COUNT > 0 then + UPDATE t_requestion_master SET status='ST023' WHERE ReqNo=REQ_NO; +end if; + +IF exit_loop THEN + CLOSE ReqList; + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; + + +UPDATE t_requestion_details REQ + left JOIN t_purchaseorder_lineItem line ON REQ.ReqNo = line.ReqNo + and REQ.MaterialCode = line.MaterialCode + left JOIN t_purchaseorder_master PO ON PO.PONO = line.PONO + SET REQ.Status = (CASE WHEN REQ.Quantity = line.Quantity THEN 'ST022' + WHEN + (REQ.Quantity > line.Quantity and line.Quantity is not null) THEN 'ST023' + +END) , + REQ.updatedOn= CURRENT_TIMESTAMP + WHERE PO.Status in ('ST014','ST015') ; + + + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; +/*!50003 DROP PROCEDURE IF EXISTS P_UPDATE_REQUISTIONSTATUS_New*/;; +/*!50003 SET @OLD_SQL_MODE=@@SQL_MODE*/;; +/*!50003 SET SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"*/;; +DELIMITER ;; +/*!50003 CREATE*/ /*!50020 DEFINER=`dbroot`@`%`*/ /*!50003 PROCEDURE `P_UPDATE_REQUISTIONSTATUS_New`() + NO SQL +BEGIN + DECLARE REQ_NO VARCHAR(10); + DECLARE LOCAL_COUNT int; + DECLARE Partial_COUNT int; + DECLARE exit_loop BOOLEAN; + DECLARE ReqList CURSOR FOR Select ReqNo from t_requestion_master where status not in('ST024','ST030') ; + DECLARE CONTINUE HANDLER FOR NOT FOUND SET exit_loop = TRUE; + + + DROP table IF EXISTS POQUANTITYLIST; + + CREATE TEMPORARY TABLE POQUANTITYLIST ( + ID INT NOT NULL auto_increment PRIMARY KEY,status varchar(10) null + ) ENGINE=MEMORY AS ( + select distinct li.ReqNo,sum(li.Quantity) as Quantity,li.MaterialCode +from + t_purchaseorder_lineItem li + left join t_purchaseorder_master PO ON PO.PONO = li.PONO + + group by + li.ReqNo,li.MaterialCode order by ReqNo); + + + + + +UPDATE t_requestion_details REQ +left JOIN POQUANTITYLIST line ON REQ.ReqNo = line.ReqNo +and REQ.MaterialCode = line.MaterialCode +SET REQ.Status = (CASE WHEN (REQ.Quantity <= line.Quantity and line.Quantity is not null ) THEN 'ST022' + WHEN + (REQ.Quantity > line.Quantity and line.Quantity is not null ) THEN 'ST023' + else 'ST003' + END) , +REQ.updatedOn= CURRENT_TIMESTAMP where REQ.Status not in ('ST049','ST050','ST053','ST054') ; + + +OPEN ReqList; +ReqList_loop: LOOP +FETCH ReqList INTO REQ_NO; + +SELECT count(*) as count INTO LOCAL_COUNT from t_requestion_details WHERE ReqNo=REQ_NO AND status !='ST022' ; +SELECT count(*) as count INTO Partial_COUNT from t_requestion_details WHERE ReqNo=REQ_NO AND status in('ST023'); +if LOCAL_COUNT = 0 then + UPDATE t_requestion_master SET status='ST005' WHERE ReqNo=REQ_NO; + +elseif Partial_COUNT > 0 then + UPDATE t_requestion_master SET status='ST023' WHERE ReqNo=REQ_NO; +end if; + +IF exit_loop THEN + CLOSE ReqList; + LEAVE ReqList_loop; + END IF; +END LOOP ReqList_loop; + + + + + + + + + + + + + + + + +END*/;; +DELIMITER ; +/*!50003 SET SQL_MODE=@OLD_SQL_MODE*/; + + +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; + +# Dump completed on 2024-07-25T13:09:13+05:30 + From c3e7e73142fef1433a98d1a53c3a9650bd01e896 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 13 Aug 2024 05:14:29 +0000 Subject: [PATCH 2/3] FIX_ merged reqlist --- app/Views/editImportAmendPO.php | 8 +- app/Views/requisitionlisting.php | 126 ++++++++++++++++++++----------- 2 files changed, 84 insertions(+), 50 deletions(-) diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index ac3e087d..80d66663 100644 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -576,7 +576,7 @@ if (!empty($RequistionDetails)) {
- + 'Select Import Option'); @@ -602,7 +602,7 @@ if (!empty($RequistionDetails)) {
- + @@ -651,7 +651,7 @@ if (!empty($RequistionDetails)) {
- + @@ -695,7 +695,7 @@ if (!empty($RequistionDetails)) {
- + + + + + + + + + +
+ +
+ +
+ + Raise New Requisition + +
+
+
+
+ + + + + + + + + + + + + + + + @@ -129,21 +156,28 @@ span.highlight { - - - - - - + + + + + + + - - - - - - StatusName ?> + + + + + From 40a2cbc4d257ff06a1dd54bb17b027eee771c771 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 13 Aug 2024 09:26:02 +0000 Subject: [PATCH 3/3] FIX_issues : ps --- app/Controllers/Inwardgateregister.php | 80 ++++++++++++++++---------- app/Views/viewinwardgateregister.php | 52 ++++++++--------- 2 files changed, 77 insertions(+), 55 deletions(-) diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index d2c5ce2a..a82917df 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -1635,44 +1635,66 @@ function updateIGRWeight(){ } } } + public function downloadFilesAsZip($igrno) - { - - // Get all file details for the given IGR number - $fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrno); - if (empty($fileDetails)) { +{ + // Get all file details for the given IGR number + $fileDetails = $this->inwardgateregister_model->getAllIgrFileDetails($igrno); + if (empty($fileDetails)) { // Display an alert message echo ''; + redirect('ViewIGR', 'refresh'); return; - } + } - // Define the root path for files - $rootPath = ROOTPATH . 'public/uploads/Igrfiles/'; + // Define the root path for files + $rootPath = ROOTPATH . 'public/uploads/Igrfiles/'; - // Create a new ZIP archive - $zip = new ZipArchive(); + // Create a new ZIP archive + $zip = new ZipArchive(); - // Define the name of the ZIP file - $zipFileName = $igrno . '.zip'; - $zipFilePath = ROOTPATH . 'public/uploads/Igrfiles/' . $zipFileName; + // Define the name of the ZIP file + $zipFileName = $igrno . '.zip'; + $zipFilePath = $rootPath . $zipFileName; - if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === TRUE) { - // Add each file to the ZIP archive - foreach ($fileDetails as $file) { - $filePath = $rootPath . $file->file; - if (file_exists($filePath)) { - $zip->addFile($filePath, $file->filename); - } - } + if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === TRUE) { + $filesAdded = false; - // Close the ZIP archive - $zip->close(); + // Add each file to the ZIP archive + foreach ($fileDetails as $file) { + $filePath = $rootPath . $file->file; + if (file_exists($filePath)) { + if (!$zip->addFile($filePath, $file->filename)) { + // Handle error when adding file to ZIP + echo ''; + $zip->close(); + redirect('ViewIGR', 'refresh'); + return; + } + $filesAdded = true; + } + } - // Return the ZIP file as a download - return $this->response->download($zipFilePath, null)->setFileName($zipFileName); - } else { - // Handle the error - echo 'Failed to create ZIP file'; - } + // Close the ZIP archive + $zip->close(); + + if ($filesAdded) { + // Return the ZIP file as a download + return $this->response->download($zipFilePath, null)->setFileName($zipFileName); + } else { + // Delete the empty ZIP file + if (file_exists($zipFilePath)) { + unlink($zipFilePath); + } + echo ''; + redirect('ViewIGR', 'refresh'); + return; + } + } else { + echo ''; + redirect('ViewIGR', 'refresh'); + return; } } + +} diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 93a686ba..3a9ae581 100644 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -205,15 +205,15 @@
Requisted DateRequisition NoRequisition TypeTot No.OfLineItem Po CreatedLineItemPartially PoCreatedLineItemNewLine ItemStatusAction
CreatedDate ); $PODate = $Pdt->format('d-m-Y'); echo $PODate ?> - ReqNo ?>ReqType ?>TotalNoofLineItems ?>PolineItems ?>PartilallyLineItems ?> newLineItem ?>ReqNo ?>ReqType ?>TotalNoofLineItems ?>PolineItems ?>PartilallyLineItems ?> newLineItem ?>StatusName ?>    
    + +
- - - - - - - - - + + + + + + + + + @@ -610,15 +610,15 @@ console.log(parsedData); $("#pendingQuantityHeader").css("display", "table-cell"); trIGRHTML += '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + '' + '' + '' + @@ -641,14 +641,14 @@ console.log(parsedData); } else { $("#pendingQuantityHeader").css("display", "none"); trIGRHTML += '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + '' + '' + '' +
SNoItem CodeItem DescriptionUOMOrdred QtyReceived QtyRemarksSNoItem CodeItem DescriptionUOMOrdered QtyReceived QtyRemarks
' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + item.UOM + '' + parseInt(item.Quantity) + '' + parseInt(item.Quantity - item.QuantityAsPerInvoice) + ' ' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + item.UOM + '' + parseInt(item.Quantity) + '' + parseInt(item.Quantity - item.QuantityAsPerInvoice) + '
' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + item.UOM + '' + item.Quantity + '' + item.QuantityAsPerInvoice + '' + item.Remarks + ' ' + i + '' + item.MaterialCode + '' + item.MaterialName + '' + item.UOM + '' + item.Quantity + '' + item.QuantityAsPerInvoice + '' + item.Remarks + '