stock module latest today vadivel J 22-01-2025
This commit is contained in:
vadivelJ96
parent
da5ae63665
commit
7b171f722a
@ -475,6 +475,9 @@ class StockController extends BaseController
|
||||
'testedBy' => $postData['testedBy'],
|
||||
'approvedBy' => $postData['approvedBy'],
|
||||
'clayOrLossOfIgnitionPercent' => $postData['clayOrLossOfIgnition'],
|
||||
'reportComments' => $postData['reportComments'],
|
||||
'gradeRange' => $postData['gradeRange'],
|
||||
'reportTime' => $postData['reportTime']
|
||||
|
||||
];
|
||||
|
||||
|
||||
@ -15,7 +15,8 @@ class IncomingSilicaSandDetailsModel extends Model
|
||||
protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition',
|
||||
'_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300',
|
||||
'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual',
|
||||
'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark','testedBy','approvedBy' , 'clayOrLossOfIgnitionPercent',
|
||||
'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark',
|
||||
'testedBy','approvedBy' , 'clayOrLossOfIgnitionPercent','reportComments','gradeRange','reportTime',
|
||||
'is_active','created_at','updated_at'];
|
||||
|
||||
protected bool $allowEmptyInserts = false;
|
||||
|
||||
@ -554,6 +554,21 @@
|
||||
<td style="display: none;">
|
||||
<?php echo $record['approvedBy'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(39)' -->
|
||||
<td style="display: none;">
|
||||
<?php echo $record['reportComments'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(40)' -->
|
||||
<td style="display: none;">
|
||||
<?php echo $record['gradeRange'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
<!-- 'td:eq(41)' -->
|
||||
<td style="display: none;">
|
||||
<?php echo $record['reportTime'] ?? ' '; ?>
|
||||
</td>
|
||||
|
||||
</tr>
|
||||
<?php
|
||||
@ -593,7 +608,7 @@
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">S.NO </th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">total </th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">IGR No-xxx</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">Invoice No-123</th>
|
||||
<th class="celda_encabezado_total" style="padding: 10px;">22-01-2025</th>
|
||||
@ -625,31 +640,31 @@
|
||||
|
||||
<tr>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_normal" style="background-color:rgb(189, 9, 6); color:#fff ;"> <h5 style="color:#fff;"> total </h5> </td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
|
||||
|
||||
<td class="celda_encabezado_normal" ><?=$summary['Qty']?></td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['plus20Loss']?></td>
|
||||
<td class="celda_encabezado_normal" > -</td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureSpec'] ?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureActual']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureLoss']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['moistureLossQty']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['sieveLossQty']?></td>
|
||||
<td class="celda_encabezado_normal" ><?=$summary['salableQty']?></td>
|
||||
<td class="v" ><?=$summary['Qty']?></td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" ><?=$summary['plus20Loss']?></td>
|
||||
<td class="celda_normal" > -</td>
|
||||
<td class="celda_normal" ><?=$summary['moistureSpec'] ?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureActual']?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureLoss']?></td>
|
||||
<td class="celda_normal" ><?=$summary['moistureLossQty']?></td>
|
||||
<td class="celda_normal" ><?=$summary['sieveLossQty']?></td>
|
||||
<td class="celda_normal" ><?=$summary['salableQty']?></td>
|
||||
|
||||
|
||||
|
||||
@ -791,11 +806,13 @@
|
||||
<td contenteditable="true" oninput="calculateRow(value='moistureValue')"
|
||||
id="dwnldMoistureActualId"> </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td style="text-align: left !important; width:25%;"><b>Moisture Spec %</b></td>
|
||||
<td contenteditable="true" oninput="calculateRow(value='moistureValue')"
|
||||
id="dwnldMoistureSpecId"> </td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
|
||||
</tbody>
|
||||
@ -952,7 +969,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="text-align: left !important; height: 50px;"><b>Remarks</b></td>
|
||||
<td contenteditable="true"></td>
|
||||
<td id="dwnldReportCommentsId" contenteditable="true"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
@ -1032,6 +1049,9 @@
|
||||
<input type="hidden" name="testedBy" id="testedBy" value="">
|
||||
<input type="hidden" name="approvedBy" id="approvedBy" value="">
|
||||
<input type="hidden" name="clayOrLossOfIgnitionPercent" id="clayOrLossOfIgnitionPercent" value="">
|
||||
<input type="hidden" name="reportsComments" id="reportComments" value="">
|
||||
<input type="hidden" name="gradeRange" id="gradeRange" value="">
|
||||
<input type="hidden" name="reportTime" id="reportTime" value="">
|
||||
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
|
||||
@ -1099,6 +1119,9 @@
|
||||
let clayOrLossOfIgnition = row.find('td:eq(36)').text().trim();
|
||||
let testedBy = row.find('td:eq(37)').text().trim();
|
||||
let approvedBy = row.find('td:eq(38)').text().trim();
|
||||
let reportComments = row.find('td:eq(39)').text().trim();
|
||||
let gradeRange = row.find('td:eq(40)').text().trim();
|
||||
let reportTime = row.find('td:eq(41)').text().trim();
|
||||
|
||||
|
||||
|
||||
@ -1112,6 +1135,9 @@
|
||||
$('#dwnldSupplierNameId').text(supplierName);
|
||||
$('#dwnldVehicleNoId').text(vehicleNo);
|
||||
$('#dwnldQtyId').text(qty);
|
||||
$('#dwnldReportCommentsId').text(reportComments);
|
||||
$('#dwnldGradeId').text(gradeRange);
|
||||
$('#dwnldTimeId').text(reportTime);
|
||||
|
||||
|
||||
if(sandType.trim().toLowerCase() == "silica sand"){
|
||||
@ -1244,6 +1270,9 @@
|
||||
$('#testedById').val(testedBy);
|
||||
$('#approvedById').val(approvedBy);
|
||||
$('#clayOrLossOfIgnitionPercent').val(clayOrLossOfIgnition);
|
||||
$('#reportComments').val(reportComments);
|
||||
$('#gradeRange').val(gradeRange);
|
||||
$('#reportTime').val(reportTime);
|
||||
|
||||
|
||||
|
||||
@ -1546,11 +1575,14 @@ $(document).ready(function() {
|
||||
gradeCondition : $('#dwnldGradeId').text(),
|
||||
testedBy : $('#testedById').val(),
|
||||
approvedBy : $('#approvedById').val(),
|
||||
clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text()
|
||||
clayOrLossOfIgnition : $('#sandType').val().trim().toLowerCase() == 'silica sand' ? $('#dwnldClayId').text(): $('#dwnldLossOfIgnitionId').text() ,
|
||||
reportComments : $('#dwnldReportCommentsId').text(),
|
||||
gradeRange : $('#dwnldGradeId').text(),
|
||||
reportTime : $('#dwnldTimeId').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.");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user