master detail module changes-1 vadivel J 10-12-2024

This commit is contained in:
vadivelJ96 2024-12-10 00:02:11 +05:30
parent 64ae59f876
commit d0141ca11a
2 changed files with 38 additions and 1 deletions

View File

@ -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) {

View File

@ -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(){