stock module latest today vadivel J 07-02-2025
This commit is contained in:
vadivelJ96
parent
337736dd6a
commit
50739673bf
@ -1326,13 +1326,17 @@ class StockController extends BaseController
|
||||
|
||||
|
||||
$dbData = [
|
||||
'date' => $data['date'],
|
||||
'opening' => $data['opening'],
|
||||
'purchaseBharath' => $data['purchaseBharath'],
|
||||
'purchaseIndian' => $data['purchaseIndian'],
|
||||
'total' => $data['total'],
|
||||
'consumption' => $data['consumption'],
|
||||
'balanceStock' => $data['balanceStock'],
|
||||
'date' => $data['date'] ,
|
||||
'opening' => $data['opening'] ,
|
||||
'purchaseBharath' => $data['purchaseBharath'] ,
|
||||
'purchaseIndian' => $data['purchaseIndian'] ,
|
||||
'total' => $data['total'] ,
|
||||
'consumption' => $data['consumption'] ,
|
||||
'balanceStock' => $data['balanceStock'] ,
|
||||
'trp_panel_gas_consumption' => $data['trpPanelGasConsumption'] ,
|
||||
'trp_physical_gas_consumption' => $data['trpPhysicalGasConsumption'] ,
|
||||
'trp_sand_production' => $data['trpSandProduction'] ,
|
||||
'rotary_drier_consumption' => $data['rotaryDrierConsumption']
|
||||
];
|
||||
|
||||
$resultExists = $this->gasStockDetails_model
|
||||
|
||||
@ -13,7 +13,8 @@ class GasStockModel extends Model
|
||||
protected $useSoftDeletes = false;
|
||||
protected $protectFields = true;
|
||||
protected $allowedFields = ['date','opening','purchaseBharath','purchaseIndian',
|
||||
'total','consumption','balanceStock'];
|
||||
'total','consumption','balanceStock',
|
||||
'trp_panel_gas_consumption','trp_physical_gas_consumption','trp_sand_production','rotary_drier_consumption'];
|
||||
|
||||
protected bool $allowEmptyInserts = false;
|
||||
protected bool $updateOnlyChanged = true;
|
||||
|
||||
@ -147,7 +147,11 @@
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 6px 10px;
|
||||
text-align: center;
|
||||
min-width: 120px;
|
||||
max-width: 120px;
|
||||
white-space: normal; /* Allows text to wrap */
|
||||
word-wrap: break-word; /* Breaks long words if needed */
|
||||
text-align: center; /* Centers text for better alignment */
|
||||
}
|
||||
|
||||
.celda_encabezado_total {
|
||||
@ -213,8 +217,8 @@
|
||||
}
|
||||
|
||||
td{
|
||||
min-width: 100px;
|
||||
max-width: 100px;
|
||||
min-width: 150px;
|
||||
max-width: 150px;
|
||||
}
|
||||
|
||||
|
||||
@ -302,7 +306,7 @@
|
||||
<th class="celda_encabezado_general">Sand Dried</th>
|
||||
<th class="celda_encabezado_general">Coating Machine</th>
|
||||
<th class="celda_encabezado_general">Sand Coated</th>
|
||||
<th class="celda_encabezado_general">Trp Machine </th>
|
||||
<th class="celda_encabezado_general" colspan="2">Trp Machine </th>
|
||||
<th class="celda_encabezado_general">Sand TRP</th>
|
||||
<th class="celda_encabezado_general">Rotary Drier </th>
|
||||
</tr>
|
||||
@ -319,7 +323,8 @@
|
||||
<th class="celda_encabezado_general">ton </th>
|
||||
<th class="celda_encabezado_general">Consumption</th>
|
||||
<th class="celda_encabezado_general">ton </th>
|
||||
<th class="celda_encabezado_general">Consumption</th>
|
||||
<th class="celda_encabezado_general">Panel Consumption</th>
|
||||
<th class="celda_encabezado_general">Physical Consumption</th>
|
||||
<th class="celda_encabezado_general">ton </th>
|
||||
<th class="celda_encabezado_general">Consumption</th>
|
||||
|
||||
@ -344,65 +349,227 @@
|
||||
?>
|
||||
|
||||
>
|
||||
|
||||
<!-- td:eq(0) -->
|
||||
<td class="celda_normal"><?=$date??'-'?></td>
|
||||
|
||||
<!-- td:eq(1) -->
|
||||
<!-- only setting opening stock editable for first day of the month -->
|
||||
<td class="celda_normal openingStock"
|
||||
<?php if($index==0){echo"contenteditable='true'";}?>
|
||||
oninput="openingStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['opening'] ?? ' '?></td>
|
||||
><?=$gasStockDetail['opening'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(2) -->
|
||||
<td class="celda_normal purchaseBharath"
|
||||
oninput="purchaseBharathStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseBharath'] ?? ' '?></td>
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseBharath'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(3) -->
|
||||
<td class="celda_normal purchaseIndian"
|
||||
oninput="purchaseIndianStockChange(this)"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseIndian'] ?? ' '?></td>
|
||||
contenteditable="true"><?=$gasStockDetail['purchaseIndian'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(4) -->
|
||||
<td class="celda_normal total"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['total'] ?? ' '?></td>
|
||||
><?=$gasStockDetail['total'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(5) -->
|
||||
<td class="celda_normal consumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['consumption'] ?? ' '?></td>
|
||||
><?=$gasStockDetail['consumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(6) -->
|
||||
<td class="celda_normal balanceStock"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['balanceStock'] ?? ' '?></td>
|
||||
><?=$gasStockDetail['balanceStock'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(7) -->
|
||||
<td class="celda_normal tenTonGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
><?=$gasStockDetail['drierMachineGasConsumption'] ?? ' '?></td>
|
||||
<td class="celda_normal">
|
||||
<?=$gasStockDetail['sandDried'] ?? ' '?></td>
|
||||
><?=$gasStockDetail['drierMachineGasConsumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(8) -->
|
||||
<td class="celda_normal sandDried"
|
||||
data-id="<?=$gasStockDetail['date']?>" >
|
||||
<?=$gasStockDetail['sandDried'] ?? ' '?></td>
|
||||
|
||||
<!-- td:eq(9) -->
|
||||
<td class="celda_normal coatingGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>" >
|
||||
<?=$gasStockDetail['coatingMachineGasconsumption'] ?? ' '?></td>
|
||||
<td class="celda_normal">
|
||||
<?=$gasStockDetail['coatedSand'] ?? ' '?></td>
|
||||
<?=$gasStockDetail['coatingMachineGasconsumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<td class="celda_normal trpGasConsumption"
|
||||
<!-- td:eq(10) -->
|
||||
<td class="celda_normal coatedSand"
|
||||
data-id="<?=$gasStockDetail['date']?>" >
|
||||
<?=$gasStockDetail['coatedSand'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(11) -->
|
||||
<td class="celda_normal trpPanelGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['trpMachineGasconsumption'] ?? ' '?></td>
|
||||
|
||||
<td class="celda_normal"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['sandTrp'] ?? ' '?>
|
||||
<?=$gasStockDetail['trp_panel_gas_consumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(12) -->
|
||||
<td class="celda_normal trpPhysicalGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['trp_physical_gas_consumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(13) -->
|
||||
<td class="celda_normal trpSandProduction"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['trp_sand_production'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
<!-- td:eq(14) -->
|
||||
<td class="celda_normal rotaryGasConsumption"
|
||||
data-id="<?=$gasStockDetail['date']?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" >
|
||||
<?=$gasStockDetail['rotaryDrierMachineGasconsumption'] ?? ' '?>
|
||||
<?=$gasStockDetail['rotary_drier_consumption'] ?? ' '?>
|
||||
</td>
|
||||
|
||||
|
||||
|
||||
</tr>
|
||||
<?php }
|
||||
}else{
|
||||
|
||||
<?php
|
||||
|
||||
//before closing inner loop we just adding the total values inside it
|
||||
|
||||
|
||||
// Initialize the material entry if it doesn't exist
|
||||
if (!isset($summary["opening"])) {
|
||||
$summary = [
|
||||
'opening' => "-" ,
|
||||
'purchaseBharath' => 0 ,
|
||||
'purchaseIndian' => 0 ,
|
||||
'total' => 0 ,
|
||||
'consumption' => 0 ,
|
||||
'balanceStock' => 0 ,
|
||||
'drierMachineGasConsumption'=>0,
|
||||
'sandDried' => 0,
|
||||
'coatingMachineGasconsumption'=>0,
|
||||
'coatedSand' => 0,
|
||||
'trp_panel_gas_consumption' => 0,
|
||||
'trp_physical_gas_consumption' => 0,
|
||||
'trp_sand_production' => 0,
|
||||
'rotary_drier_consumption' => 0
|
||||
];
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
// Sum values for the material
|
||||
|
||||
$summary["opening"] = 0 ;
|
||||
$summary["purchaseBharath"] = is_numeric($gasStockDetail['purchaseBharath']) ? $gasStockDetail['purchaseBharath'] : 0 ;
|
||||
$summary["purchaseIndian"] += is_numeric($gasStockDetail['purchaseIndian']) ? $gasStockDetail['purchaseIndian'] : 0 ;
|
||||
$summary["total"] += is_numeric($gasStockDetail['total']) ? $gasStockDetail['total'] : 0 ;
|
||||
$summary["consumption"] += is_numeric($gasStockDetail['consumption']) ? $gasStockDetail['consumption'] : 0 ;
|
||||
$summary["balanceStock"] += is_numeric($gasStockDetail['balanceStock']) ? $gasStockDetail['balanceStock'] : 0 ;
|
||||
|
||||
$summary["drierMachineGasConsumption"] = is_numeric( $gasStockDetail['drierMachineGasConsumption']) ? $gasStockDetail['drierMachineGasConsumption'] : 0 ;
|
||||
$summary["sandDried"] = is_numeric( $gasStockDetail['sandDried']) ? $gasStockDetail['sandDried'] : 0 ;
|
||||
$summary["coatingMachineGasconsumption"] += is_numeric($gasStockDetail['coatingMachineGasconsumption']) ? $gasStockDetail['coatingMachineGasconsumption'] : 0 ;
|
||||
$summary["coatedSand"] += is_numeric($gasStockDetail['coatedSand']) ? $gasStockDetail['coatedSand'] : 0 ;
|
||||
$summary["trp_panel_gas_consumption"] += is_numeric($gasStockDetail['trp_panel_gas_consumption']) ? $gasStockDetail['trp_panel_gas_consumption'] : 0 ;
|
||||
$summary["trp_physical_gas_consumption"] += is_numeric($gasStockDetail['trp_physical_gas_consumption']) ? $gasStockDetail['trp_physical_gas_consumption'] : 0 ;
|
||||
|
||||
$summary["trp_sand_production"] += is_numeric($gasStockDetail['trp_sand_production']) ? $gasStockDetail['trp_sand_production'] : 0 ;
|
||||
$summary["rotary_drier_consumption"] += is_numeric($gasStockDetail['rotary_drier_consumption']) ? $gasStockDetail['rotary_drier_consumption'] : 0 ;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
} ?>
|
||||
|
||||
<div class="table-responsive">
|
||||
<table id="gasStockDetailsTableSummaryId" class="fht-table table-striped">
|
||||
|
||||
<thead class="celda_encabezado_total" style="padding: 10px;">
|
||||
|
||||
|
||||
|
||||
<tr>
|
||||
<th class="celda_encabezado_total">Date </th>
|
||||
<th class="celda_encabezado_total">Opening Stock</th>
|
||||
<th class="celda_encabezado_total">Purchase(Bharath)</th>
|
||||
<th class="celda_encabezado_total">Purchase(Indian)</th>
|
||||
<th class="celda_encabezado_total">Total</th>
|
||||
<th class="celda_encabezado_total">Consumption </th>
|
||||
<th class="celda_encabezado_total">Balance Stock</th>
|
||||
<th class="celda_encabezado_total">Consumption </th>
|
||||
<th class="celda_encabezado_total">ton </th>
|
||||
<th class="celda_encabezado_total">Consumption</th>
|
||||
<th class="celda_encabezado_total">ton </th>
|
||||
<th class="celda_encabezado_total">Panel Consumption</th>
|
||||
<th class="celda_encabezado_total">Physical Consumption</th>
|
||||
<th class="celda_encabezado_total">ton </th>
|
||||
<th class="celda_encabezado_total">Consumption</th>
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
|
||||
<td style="background-color:rgb(189, 9, 6); color:#ffff;">
|
||||
<b> Total </b>
|
||||
</td>
|
||||
|
||||
|
||||
<td class="celda_normal"><?= $summary['opening'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['purchaseBharath'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['purchaseIndian'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['total'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['consumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['total'] - $summary['consumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['drierMachineGasConsumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['sandDried'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['coatingMachineGasconsumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['coatedSand'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['trp_panel_gas_consumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['trp_physical_gas_consumption'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['trp_sand_production'] ?></td>
|
||||
<td class="celda_normal"><?= $summary['rotary_drier_consumption'] ?></td>
|
||||
|
||||
|
||||
|
||||
</tr>
|
||||
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<?php }else{
|
||||
$date = DateTime::createFromFormat('M-Y', $month);
|
||||
|
||||
$startDate = $date->modify('first day of this month')->format('Y-m-d');
|
||||
@ -468,24 +635,34 @@
|
||||
<td class="celda_normal tenTonGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
> </td>
|
||||
<td class="celda_normal"> </td>
|
||||
<td class="celda_normal sandDried"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
> </td>
|
||||
<td class="celda_normal coatingGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
> </td>
|
||||
<td class="celda_normal"> </td>
|
||||
<td class="celda_normal trpGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
> </td>
|
||||
<td class="celda_normal"
|
||||
contenteditable="true"
|
||||
> </td>
|
||||
<td class="celda_normal coatedSand"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
> </td>
|
||||
|
||||
<td class="celda_normal trpPanelGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" > </td>
|
||||
|
||||
<td class="celda_normal trpPhysicalGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
contenteditable="true" > </td>
|
||||
|
||||
<td class="celda_normal trpSandProduction"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true" > </td>
|
||||
|
||||
<td class="celda_normal rotaryGasConsumption"
|
||||
data-id="<?=$dateInMonth?>"
|
||||
contenteditable="true"
|
||||
oninput = "gasConsumptionChange(this)"
|
||||
> </td>
|
||||
contenteditable="true" > </td>
|
||||
</tr>
|
||||
<?php }
|
||||
}?>
|
||||
@ -675,7 +852,11 @@
|
||||
purchaseIndian: rowCells.eq(3).text().trim()|| ' ',
|
||||
total: rowCells.eq(4).text().trim()|| ' ',
|
||||
consumption: rowCells.eq(5).text().trim()|| ' ',
|
||||
balanceStock: rowCells.eq(6).text().trim()|| ' '
|
||||
balanceStock: rowCells.eq(6).text().trim()|| ' ',
|
||||
trpPanelGasConsumption : rowCells.eq(11).text().trim()|| ' ',
|
||||
trpPhysicalGasConsumption: rowCells.eq(12).text().trim()|| ' ',
|
||||
trpSandProduction : rowCells.eq(13).text().trim()|| ' ',
|
||||
rotaryDrierConsumption : rowCells.eq(14).text().trim()|| ' ',
|
||||
};
|
||||
|
||||
rows.push(rowData);
|
||||
@ -771,12 +952,14 @@
|
||||
let date = dataId;
|
||||
|
||||
//total gas consumption
|
||||
let tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let trpGasConsumption = validateInput(document.querySelector(`td.trpGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let rotaryGasConsumption = validateInput(document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
|
||||
let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpGasConsumption) + Number(rotaryGasConsumption) ;
|
||||
let tenTonGasConsumption = validateInput(document.querySelector(`td.tenTonGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let coatingGasConsumption = validateInput(document.querySelector(`td.coatingGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let trpPanelGasConsumption = validateInput(document.querySelector(`td.trpPanelGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let trpPhysicalGasConsumption = validateInput(document.querySelector(`td.trpPhysicalGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
let rotaryGasConsumption = validateInput(document.querySelector(`td.rotaryGasConsumption[data-id="${dataId}"]`).innerText);
|
||||
|
||||
let toatalGasConsumption = Number(tenTonGasConsumption) + Number (coatingGasConsumption) + Number(trpPhysicalGasConsumption)
|
||||
+ Number(trpPanelGasConsumption) + Number(rotaryGasConsumption) ;
|
||||
|
||||
|
||||
//total gas purchase and opening addition
|
||||
@ -790,9 +973,9 @@
|
||||
|
||||
document.querySelector(`td.total[data-id="${dataId}"]`).innerText = totalGas;
|
||||
document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText = toatalGasConsumption ;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
|
||||
document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock ;
|
||||
|
||||
updateStockValue( date,currentBalanceStock )
|
||||
updateStockValue( date,currentBalanceStock)
|
||||
|
||||
} catch(error){
|
||||
console.error("There is an error updating stock ..!!" + error);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user