stock module latest today vadivel J 21-01-2025
This commit is contained in:
vadivelJ96
parent
b3311f78cb
commit
f1fcc76629
@ -478,6 +478,8 @@ class StockController extends BaseController
|
||||
|
||||
];
|
||||
|
||||
dd($dbData);
|
||||
|
||||
$resultExists = $this->incomingSilicaSandDetails_model
|
||||
->where('id', $id)
|
||||
->first();
|
||||
|
||||
@ -152,9 +152,9 @@ class Rawmaterialdetails_model extends Model
|
||||
return array_column($materialResults, 'MaterialCode');
|
||||
}
|
||||
|
||||
function getAllWasteCoreSandMaterialCode(){
|
||||
function getAllWasteCoreSandMaterialCode(){
|
||||
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
$builder = $this->db->table('t_materialmaster')
|
||||
->select('MaterialCode')
|
||||
->where('Category', 'waste core')
|
||||
->orderBy('CreatedDate', 'desc');
|
||||
|
||||
@ -113,6 +113,15 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.celda_encabezado_total {
|
||||
background-color:#ffffff;
|
||||
border: 1px solid #ccc;
|
||||
color: #ffffff;
|
||||
font-weight: bold;
|
||||
padding: 6px 10px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
._Separador {
|
||||
background-color: #fff;
|
||||
height: 12px;
|
||||
@ -396,13 +405,84 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<?php
|
||||
|
||||
//before closing inner loop
|
||||
|
||||
if (!isset($summary['drier_running_hours'])) {
|
||||
$summary['drier_running_hours'] = 0 ;
|
||||
$summary['total_gas_consumption'] = 0 ;
|
||||
$summary['input_sand_qty'] = 0 ;
|
||||
$summary['moisture_loss_qty'] = 0 ;
|
||||
$summary['sand_dried_qty'] = 0 ;
|
||||
$summary['dust_qty'] = 0 ;
|
||||
}
|
||||
|
||||
$summary['drier_running_hours'] += $a['drier_running_hours'] == "-" ? 0 : (float) $a['drier_running_hours'] ;
|
||||
$summary['total_gas_consumption'] += $a['total_gas_consumption'] == "-" ? 0 : (float) $a['total_gas_consumption'] ;
|
||||
$summary['input_sand_qty'] += $a['input_sand_qty'] == "-" ? 0 : (float) $a['input_sand_qty'] ;
|
||||
$summary['moisture_loss_qty'] += $a['moisture_loss_qty'] == "-" ? 0 : (float) $a['moisture_loss_qty'] ;
|
||||
$summary['sand_dried_qty'] += $a['sand_dried_qty'] == "-" ? 0 : (float) $a['sand_dried_qty'] ;
|
||||
$summary['dust_qty'] += $a['dust_qty'] == "-" ? 0 : (float) $a['dust_qty'] ;
|
||||
|
||||
|
||||
} ?>
|
||||
|
||||
|
||||
</tbody>
|
||||
<?php } ?>
|
||||
</table>
|
||||
|
||||
<?php if(!empty($drierDetails)){ ?>
|
||||
|
||||
<table id="drierTableSummaryId" class="fht-table table-striped">
|
||||
|
||||
<thead >
|
||||
<tr>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Date value</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Drier On Time </th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Drier Off Time</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Running Hrs</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Supplier Name is a dropdown feature</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">i/p Sand Moisture(%)</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Tot Gas Consumption</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Gas Per Ton</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">i/p Sand Qty</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Moisture Loss Qty</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Sand Dried Qty</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Qty Per Hrs</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Dust Qty</th>
|
||||
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
|
||||
<tr>
|
||||
|
||||
<td style="background-color:rgb(189, 9, 6); color:#ffff;">
|
||||
<b> Total </b>
|
||||
</td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal "><?=$summary['drier_running_hours']?></td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal "><?=$summary['total_gas_consumption']?></td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal "><?=$summary['input_sand_qty']?></td>
|
||||
<td class="celda_normal "><?=$summary['moisture_loss_qty']?></td>
|
||||
<td class="celda_normal "><?=$summary['sand_dried_qty']?></td>
|
||||
<td class="celda_normal ">-</td>
|
||||
<td class="celda_normal "><?=$summary['dust_qty']?></td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<?php } ?>
|
||||
|
||||
|
||||
<?php if(empty($drierDetails)){ ?>
|
||||
<br><br>
|
||||
@ -413,6 +493,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
|
||||
<?php } ?>
|
||||
|
||||
|
||||
|
||||
|
||||
</div><!-- End table-responsive -->
|
||||
|
||||
|
||||
|
||||
@ -381,62 +381,62 @@
|
||||
|
||||
<!-- 'td:eq(10)' -->
|
||||
<td style="display:none" >
|
||||
<?php echo $record['_10']??'0.00'; ?>
|
||||
<?php echo $record['_10'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(11)' -->
|
||||
<td style="display:none" >
|
||||
<?php echo $record['_20']??'0.00'; ?>
|
||||
<?php echo $record['_20'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(12)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_30']??'0.00'; ?>
|
||||
<?php echo $record['_30'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(13)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_40']??'0.00'; ?>
|
||||
<?php echo $record['_40'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(14)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_50']??'0.00'; ?>
|
||||
<?php echo $record['_50'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(15)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_70']??'0.00'; ?>
|
||||
<?php echo $record['_70'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(16)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_100']??'0.00'; ?>
|
||||
<?php echo $record['_100'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(17)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_140']??'0.00'; ?>
|
||||
<?php echo $record['_140'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(18)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_200']??'0.00'; ?>
|
||||
<?php echo $record['_200'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(19)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['_300']??'0.00'; ?>
|
||||
<?php echo $record['_300'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(20)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['pan']??'0.00'; ?>
|
||||
<?php echo $record['pan'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(21)' -->
|
||||
<td style="display:none">
|
||||
<?php echo $record['total']??'0.00'; ?>
|
||||
<?php echo $record['total'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
|
||||
@ -449,52 +449,52 @@
|
||||
|
||||
<!-- 'td:eq(23)' -->
|
||||
<td class="celda_normal" contenteditable="true">
|
||||
<?php echo $record['afsSpec']??'0.00'; ?>
|
||||
<?php echo $record['afsSpec'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(24)' -->
|
||||
<td class="celda_normal" contenteditable="true">
|
||||
<?php echo $record['afsActual']??'0.00'; ?>
|
||||
<?php echo $record['afsActual']??' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(25)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['plus20Loss']??'0.00'; ?>
|
||||
<?php echo $record['plus20Loss'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(26)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['plus30Loss']??'0.00'; ?>
|
||||
<?php echo $record['plus30Loss'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(27)' -->
|
||||
<td class="celda_normal" >
|
||||
<?php echo $record['moistureSpec']??'0.00'; ?>
|
||||
<?php echo $record['moistureSpec'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(28)' -->
|
||||
<td class="celda_normal" id="moistureActualId">
|
||||
<?php echo $record['moistureActual']??'0.00'; ?>
|
||||
<?php echo $record['moistureActual'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(29)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['moistureLoss']??'0.00'; ?>
|
||||
<?php echo $record['moistureLoss'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(30)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['moistureLossQty']??'0.00'; ?>
|
||||
<?php echo $record['moistureLossQty'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(31)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['sieveLossQty']??'0.00'; ?>
|
||||
<?php echo $record['sieveLossQty'] ?? ''; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(32)' -->
|
||||
<td class="celda_normal">
|
||||
<?php echo $record['salableQty']??'0.00'; ?>
|
||||
<?php echo $record['salableQty'] ?? ''; ?>
|
||||
</td>
|
||||
|
||||
<!-- need to check the status and select values before hand -->
|
||||
@ -899,22 +899,22 @@
|
||||
<input type="hidden" name="materialCode" id="materialCode" value="">
|
||||
<input type="hidden" name="qty" id="qty" value="">
|
||||
<input type="hidden" name="sandType" id="sandType" value="">
|
||||
<input type="hidden" name="10Mm" id="10Mm" value="0.00">
|
||||
<input type="hidden" name="20Mm" id="20Mm" value="0.00">
|
||||
<input type="hidden" name="30Mm" id="30Mm" value="0.00">
|
||||
<input type="hidden" name="40Mm" id="40Mm" value="0.00">
|
||||
<input type="hidden" name="50Mm" id="50Mm" value="0.00">
|
||||
<input type="hidden" name="70Mm" id="70Mm" value="0.00">
|
||||
<input type="hidden" name="100Mm" id="100Mm" value="0.00">
|
||||
<input type="hidden" name="140Mm" id="140Mm" value="0.00">
|
||||
<input type="hidden" name="200Mm" id="200Mm" value="0.00">
|
||||
<input type="hidden" name="300Mm" id="300Mm" value="0.00">
|
||||
<input type="hidden" name="pan" id="pan" value="0.00" >
|
||||
<input type="hidden" name="total" id="total" value="0.00" >
|
||||
<input type="hidden" name="moistureSpec" id="moistureSpec" value="0.00">
|
||||
<input type="hidden" name="moistureActual" id="moistureActual" value="0.00">
|
||||
<input type="hidden" name="moistureLoss" id="moistureLoss" value="0.00" >
|
||||
<input type="hidden" name="moistureLossQty" id="moistureLossQty" value="0.00">
|
||||
<input type="hidden" name="10Mm" id="10Mm" value="">
|
||||
<input type="hidden" name="20Mm" id="20Mm" value="">
|
||||
<input type="hidden" name="30Mm" id="30Mm" value="">
|
||||
<input type="hidden" name="40Mm" id="40Mm" value="">
|
||||
<input type="hidden" name="50Mm" id="50Mm" value="">
|
||||
<input type="hidden" name="70Mm" id="70Mm" value="">
|
||||
<input type="hidden" name="100Mm" id="100Mm" value="">
|
||||
<input type="hidden" name="140Mm" id="140Mm" value="">
|
||||
<input type="hidden" name="200Mm" id="200Mm" value="">
|
||||
<input type="hidden" name="300Mm" id="300Mm" value="">
|
||||
<input type="hidden" name="pan" id="pan" value="" >
|
||||
<input type="hidden" name="total" id="total" value="" >
|
||||
<input type="hidden" name="moistureSpec" id="moistureSpec" value="">
|
||||
<input type="hidden" name="moistureActual" id="moistureActual" value="">
|
||||
<input type="hidden" name="moistureLoss" id="moistureLoss" value="" >
|
||||
<input type="hidden" name="moistureLossQty" id="moistureLossQty" value="">
|
||||
<input type="hidden" name="plus20Loss" id="plus20Loss" value="">
|
||||
<input type="hidden" name="plus30Loss" id="plus30Loss" value="">
|
||||
<input type="hidden" name="sieveLossQty" id="sieveLossQty" value="">
|
||||
@ -1003,7 +1003,8 @@
|
||||
$('#dwnldVehicleNoId').text(vehicleNo);
|
||||
$('#dwnldQtyId').text(qty);
|
||||
|
||||
if(sandType == "silicasand"){
|
||||
|
||||
if(sandType.trim().toLowerCase() == "silica sand"){
|
||||
|
||||
$('#dwnldLossOfIgnitionRowId').hide();
|
||||
$('#dwnldClayRowId').show();
|
||||
@ -1020,47 +1021,47 @@
|
||||
|
||||
let dwnld10MmFId = parseFloat(_10Mm * 5).toFixed(2);
|
||||
$('#dwnld10MmId').text(_10Mm);
|
||||
$('#dwnld10MmFId').text(dwnld10MmFId);
|
||||
$('#dwnld10MmFId').text(dwnld10MmFId == "0.00" ? " " : dwnld10MmFId);
|
||||
|
||||
let dwnld20MmFId = parseFloat(_20Mm * 10).toFixed(2);
|
||||
$('#dwnld20MmId').text(_20Mm);
|
||||
$('#dwnld20MmFId').text(dwnld20MmFId);
|
||||
$('#dwnld20MmFId').text(dwnld20MmFId == "0.00" ? " " : dwnld20MmFId);
|
||||
|
||||
let dwnld30MmFId = parseFloat(_30Mm * 20).toFixed(2);
|
||||
$('#dwnld30MmId').text(_30Mm);
|
||||
$('#dwnld30MmFId').text(dwnld30MmFId);
|
||||
$('#dwnld30MmFId').text(dwnld30MmFId == "0.00" ? " " : dwnld30MmFId);
|
||||
|
||||
let dwnld40MmFId = parseFloat(_40Mm * 30).toFixed(2);
|
||||
$('#dwnld40MmId').text(_40Mm);
|
||||
$('#dwnld40MmFId').text(dwnld40MmFId);
|
||||
$('#dwnld40MmFId').text(dwnld40MmFId == "0.00" ? " " : dwnld40MmFId);
|
||||
|
||||
let dwnld50MmFId = parseFloat(_50Mm * 40).toFixed(2);
|
||||
$('#dwnld50MmId').text(_50Mm);
|
||||
$('#dwnld50MmFId').text(dwnld50MmFId);
|
||||
$('#dwnld50MmFId').text(dwnld50MmFId == "0.00" ? " " : dwnld50MmFId);
|
||||
|
||||
let dwnld70MmFId = parseFloat(_70Mm * 50).toFixed(2);
|
||||
$('#dwnld70MmId').text(_70Mm);
|
||||
$('#dwnld70MmFId').text(dwnld70MmFId);
|
||||
$('#dwnld70MmFId').text(dwnld70MmFId == "0.00" ? " " : dwnld70MmFId);
|
||||
|
||||
let dwnld100MmFId = parseFloat(_100Mm * 70).toFixed(2);
|
||||
$('#dwnld100MmId').text(_100Mm);
|
||||
$('#dwnld100MmFId').text(dwnld100MmFId);
|
||||
$('#dwnld100MmFId').text(dwnld100MmFId == "0.00" ? " " : dwnld100MmFId);
|
||||
|
||||
let dwnld140MmFId = parseFloat(_140Mm * 100).toFixed(2);
|
||||
$('#dwnld140MmId').text(_140Mm);
|
||||
$('#dwnld140MmFId').text(dwnld140MmFId);
|
||||
$('#dwnld140MmFId').text(dwnld140MmFId == "0.00" ? " " : dwnld140MmFId);
|
||||
|
||||
let dwnld200MmFId = parseFloat(_200Mm * 140).toFixed(2);
|
||||
$('#dwnld200MmId').text(_200Mm);
|
||||
$('#dwnld200MmFId').text(dwnld200MmFId);
|
||||
$('#dwnld200MmFId').text(dwnld200MmFId == "0.00" ? " " : dwnld200MmFId);
|
||||
|
||||
let dwnld300MmFId = parseFloat(_300Mm * 200).toFixed(2);
|
||||
$('#dwnld300MmId').text(_300Mm);
|
||||
$('#dwnld300MmFId').text(dwnld300MmFId);
|
||||
$('#dwnld300MmFId').text(dwnld300MmFId == "0.00" ? " " : dwnld300MmFId);
|
||||
|
||||
let dwnldPanFId = parseFloat(pan * 300).toFixed(2);
|
||||
$('#dwnldPanId') .text(pan);
|
||||
$('#dwnldPanFId') .text(dwnldPanFId);
|
||||
$('#dwnldPanFId') .text(dwnldPanFId == "0.00" ? " " : dwnldPanFId);
|
||||
|
||||
let fTotal =
|
||||
(parseFloat(dwnld10MmFId)+
|
||||
@ -1274,8 +1275,8 @@
|
||||
let result = table.tableToJSON();
|
||||
|
||||
let qty = parseFloat($('#dwnldQtyId').text());
|
||||
let moistureSpec = $('#dwnldMoistureSpecId').text();
|
||||
let moistureActual = $('#dwnldMoistureActualId').text();
|
||||
let moistureSpec = validateInput($('#dwnldMoistureSpecId').text().trim()) ;
|
||||
let moistureActual = validateInput($('#dwnldMoistureActualId').text().trim()) ;
|
||||
let totalWeighOfSand = 0 ;
|
||||
let totalFactoredValue = 0 ;
|
||||
let afs = 0 ;
|
||||
@ -1291,7 +1292,7 @@
|
||||
|
||||
if(i === 0 || i === 1 || i === 2){
|
||||
newPlus30Loss += Number(result[i]['WEIGH OF SAND']) ;
|
||||
newSieveLossQty = (parseFloat(qty) * newPlus30Loss) / 100 ;
|
||||
newSieveLossQty = (parseFloat(qty) * newPlus20Loss) / 100 ;
|
||||
}
|
||||
|
||||
totalWeighOfSand += Number(result[i]['WEIGH OF SAND']) ;
|
||||
@ -1312,7 +1313,7 @@
|
||||
|
||||
let newSalableQty = (parseFloat(qty) - newMoistureLossQty - newSieveLossQty).toFixed(2) ;
|
||||
|
||||
newSieveLossQty = (newSieveLossQty).toFixed(2);newPlus20Loss
|
||||
newSieveLossQty = (newSieveLossQty).toFixed(2);
|
||||
|
||||
newPlus20Loss = (newPlus20Loss).toFixed(2);
|
||||
|
||||
@ -1405,12 +1406,12 @@ $(document).ready(function() {
|
||||
remark : $('#dwnldAcceptedId').text(),
|
||||
gradeCondition : $('#dwnldGradeId').text(),
|
||||
testedBy : $('#testedById').val(),
|
||||
approvedBy : $('#approvedById').val(),
|
||||
clayOrLossOfIgnition : $('#sandType').val() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text()
|
||||
approvedBy : $('#approvedById').val(),
|
||||
clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text()
|
||||
},
|
||||
success: function(data){
|
||||
alert("Data Saved Successfully..!!");
|
||||
window.location.reload();
|
||||
// window.location.reload();
|
||||
},
|
||||
error : function(xhr, status, error){
|
||||
alert("An error occurred while processing the request. Please try again.");
|
||||
@ -1428,4 +1429,28 @@ $(document).ready(function() {
|
||||
|
||||
|
||||
})
|
||||
</script>
|
||||
|
||||
|
||||
<script>
|
||||
function validateInput(input) {
|
||||
|
||||
|
||||
if (input == '' || input == ' ' || input == '-') {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (typeof input === 'string' && input.split('').map(char => char.charCodeAt(0))[0] == 10) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
// Validate against the regex
|
||||
const isValid = /^-?\d*\.?\d*$/.test(input);
|
||||
if (!isValid) {
|
||||
alert('Invalid input! Please enter a valid number.');
|
||||
return 0;
|
||||
}
|
||||
|
||||
return input;
|
||||
}
|
||||
</script>
|
||||
Loading…
Reference in New Issue
Block a user