RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock module latest today vadivel J 21-02-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-02-21 12:22:49 +05:30
parent 50db9f5ae5
commit 2885d14239
4 changed files with 423 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Rawmaterialdetails_model.php
View File

@ -146,7 +146,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode') ->select('MaterialCode')
->where('Category', 'silica sand') ->where('Category', '248')
->orderBy('CreatedDate', 'desc'); ->orderBy('CreatedDate', 'desc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $materialResults = $query->getResultArray();
@ -158,7 +158,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode') ->select('MaterialCode')
->where('Category', 'waste core') ->where('Category', '328')
->orderBy('CreatedDate', 'desc'); ->orderBy('CreatedDate', 'desc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $materialResults = $query->getResultArray();
@ -171,7 +171,7 @@ class Rawmaterialdetails_model extends Model
//when no data present for current month we are showing only active materials with filter option //when no data present for current month we are showing only active materials with filter option
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', 'Packing Material') ->where('Category', '236')
->where('IsActive', 1) ->where('IsActive', 1)
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $query = $builder->get();
@ -184,7 +184,7 @@ class Rawmaterialdetails_model extends Model
//when data present with whether material is active or not we have to show them with filter option //when data present with whether material is active or not we have to show them with filter option
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', 'Packing Material') ->where('Category', '236')
->whereIn('MaterialCode', $distinctMaterialCodes) ->whereIn('MaterialCode', $distinctMaterialCodes)
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $query = $builder->get();
@ -199,7 +199,7 @@ class Rawmaterialdetails_model extends Model
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode , MaterialName') ->select('MaterialCode , MaterialName')
->where('IsActive', 1) ->where('IsActive', 1)
->where('Category', 'Resin') ->where('Category', '327')
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');
$query = $builder->get(); $query = $builder->get();
$materialResults = $query->getResultArray(); $materialResults = $query->getResultArray();
@ -212,6 +212,7 @@ class Rawmaterialdetails_model extends Model
{ {
$builder = $this->db->table('t_materialmaster') $builder = $this->db->table('t_materialmaster')
->select('MaterialCode, MaterialName') ->select('MaterialCode, MaterialName')
->where('Category', '327')
->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array ->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array
->orderBy('MaterialCode', 'asc'); ->orderBy('MaterialCode', 'asc');

7
app/Views/stock/dieselStockDetails.php
View File

@ -704,6 +704,7 @@ foreach ($period as $day) {
<?php <?php
// dd($previousMonthDieselMachineStockDetails);
foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) { foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) {
?> ?>
<!-- this will loop till machines present --> <!-- this will loop till machines present -->
@ -731,7 +732,7 @@ foreach ($period as $day) {
><?= !empty($previousMonthDieselMachineStockDetails) ><?= (!empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) )
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ; :" " ;
?> ?>
@ -740,7 +741,9 @@ foreach ($period as $day) {
<td class="celda_normal closingReading" <td class="celda_normal closingReading"
data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>" data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
oninput="closingReadingChange(this)" oninput="closingReadingChange(this)"
contenteditable="true"><?= !empty($previousMonthDieselMachineStockDetails) contenteditable="true">
<?= !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex])
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ; :" " ;
?> ?>

754
app/Views/stock/powerConsumptionDetails.php
View File

File diff suppressed because it is too large Load Diff

1
app/Views/stock/resinStockDetails.php
View File

@ -511,6 +511,7 @@ foreach ($period as $day) {
} }
?>> ?>>
<?php <?php
// dd($resinMaterials);
foreach ($resinMaterials as $resinMaterialIndex => $resinMaterial) { ?> foreach ($resinMaterials as $resinMaterialIndex => $resinMaterial) { ?>
<!-- this will loop till materials present --> <!-- this will loop till materials present -->