From d0141ca11a4b2defce30396e78679b8c179b62ef Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Tue, 10 Dec 2024 00:02:11 +0530
Subject: [PATCH] master detail module changes-1  vadivel J 10-12-2024

---
 app/Controllers/StockController.php     | 23 ++++++++++++++++++++++-
 app/Models/Rawmaterialdetails_model.php | 16 ++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index b350f0f5..e0f437cd 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -470,9 +470,30 @@ class StockController extends BaseController
         $data['groupedBagStockDetails'] = array_values($groupedByDate);
 
 
+        /**
+         * need to change the below condition to allow active bag materials for new entries
+         * not for older entries
+        **/
 
-        $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode();
+        if(!empty($data['groupedBagStockDetails'])){
 
+            $result = $this->bagStockDetails_model
+            ->select('materialCode') // Specify the column you want to select
+            ->distinct() // Use distinct without arguments
+            ->orderBy('materialCode', 'asc')
+            ->findAll();
+            $distinctMaterialCodes=[];
+             foreach($result as $index => $eachResult){
+               $distinctMaterialCodes[] = $result[$index]['materialCode'];
+             }
+            $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($distinctMaterialCodes);
+        
+        }else{
+            $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode();
+
+        }
+
+        
 
 
         foreach ($bagMaterials as $key => $bagMaterial) {
diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php
index 321d1a24..df8e28a6 100755
--- a/app/Models/Rawmaterialdetails_model.php
+++ b/app/Models/Rawmaterialdetails_model.php
@@ -164,6 +164,22 @@ class Rawmaterialdetails_model extends Model
         return $materialResults;
 
     }
+    
+    
+    function getSelectedBagMaterialCode($distinctMaterialCodes)
+    {
+        $builder = $this->db->table('t_materialmaster')
+            ->select('MaterialCode, MaterialName') 
+            ->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array
+            ->orderBy('MaterialCode', 'asc');
+        
+        $query = $builder->get();
+        $materialResults = $query->getResultArray();
+    
+        return $materialResults;
+    }
+    
+
 
     function getAllResinMaterialCode(){