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

stock module dev 22/10 changes -vadivel J

Browse Source
This commit is contained in:
vadivelJ96 2024-10-22 00:54:26 +05:30
parent 13b851d4be
commit 6e894665fc
3 changed files with 187 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/StockController.php
View File

@ -142,15 +142,13 @@ class StockController extends BaseController
$materialCodes = $this->rawmaterialdetails_model->getAllSilicaRawMaterialCode(); $materialCodes = $this->rawmaterialdetails_model->getAllSilicaRawMaterialCode();
if (!empty($materialCodes)) { // Proceed if there are matching MaterialCodes if (!empty($materialCodes)) {
$data['igrDetails'] = $this->inwardGateRegister_model->findIgrForSilicaSand($materialCodes,$month); $data['igrDetails'] = $this->inwardGateRegister_model->findIgrForSilicaSand($materialCodes,$month);
} else { } else {
$data['igrDetails'] = []; // If no materials found, return an empty array $data['igrDetails'] = [];
} }
//$data['incomingSilicaSandDetails']=$this->incomingSilicaSandDetails_model->
return $this->loadViews("incomingSilicaSandDetails", $this->global, $data, NULL); return $this->loadViews("incomingSilicaSandDetails", $this->global, $data, NULL);
} }

12
app/Models/Inwardgateregister_model.php
View File

@ -1034,14 +1034,15 @@ class Inwardgateregister_model extends Model
public function findIgrForSilicaSand($materialCodes, $month) public function findIgrForSilicaSand($materialCodes, $month)
{ {
$builder = $this->db->table('t_igr_details') $builder = $this->db->table('t_igr_details')
->select('t_igr_details.IGRNO, ->select(
't_igr_details.IGRNO,
t_igr_details.Remarks,
t_igr_details.MaterialCode, t_igr_details.MaterialCode,
igrMast.DeliveryChellanOrInvoiceNo as invoiceNo, igrMast.DeliveryChellanOrInvoiceNo as invoiceNo,
igrMast.DeliveryChellanDate as invoiceDate, igrMast.DeliveryChellanDate as invoiceDate,
igrMast.MaterialRcvdDate as materialRecievedDate, igrMast.MaterialRcvdDate as materialRecievedDate,
supplierDetails.SupplierName,
igrMast.VehicleNo, igrMast.VehicleNo,
t_igr_details.Remarks, supplierDetails.SupplierName,
SUM(t_igr_details.QuantityAsPerInvoice) as Qty, SUM(t_igr_details.QuantityAsPerInvoice) as Qty,
issd.* ') issd.* ')
->whereIn('t_igr_details.MaterialCode', $materialCodes) ->whereIn('t_igr_details.MaterialCode', $materialCodes)
@ -1049,11 +1050,10 @@ class Inwardgateregister_model extends Model
->groupBy('t_igr_details.IGRNO, t_igr_details.MaterialCode') ->groupBy('t_igr_details.IGRNO, t_igr_details.MaterialCode')
->join('t_igr_master igrMast', 'igrMast.IGRNO = t_igr_details.IGRNO') ->join('t_igr_master igrMast', 'igrMast.IGRNO = t_igr_details.IGRNO')
->join('t_incomingSilicaSandDetails issd', ->join('t_incomingSilicaSandDetails issd',
'issd.igrNo_fk = t_igr_details.IGRNO AND issd.materialCode = t_igr_details.MaterialCode','left') 'issd.igrNo_fk = t_igr_details.IGRNO AND issd.materialCode = t_igr_details.MaterialCode','left')
->join('t_purchaseorder_master poMaster', 'poMaster.PONO = igrMast.PONO', 'left') ->join('t_purchaseorder_master poMaster', 'poMaster.PONO = igrMast.PONO', 'left')
->join('t_supplierdetailsn supplierDetails', 'supplierDetails.SupplierID = poMaster.SupplierID', 'left') ->join('t_supplierdetailsn supplierDetails', 'supplierDetails.SupplierID = poMaster.SupplierID', 'left')
->orderBy('t_igr_details.CreatedDate', 'DESC');
->orderBy('t_igr_details.CreatedDate', 'DESC');
$query = $builder->get(); $query = $builder->get();
$result = $query->getResultArray(); $result = $query->getResultArray();

213
app/Views/incomingSilicaSandDetails.php
View File

@ -213,8 +213,8 @@
<table id="drierTable" class="fht-table table-striped" style="font-size: small;"> <table id="drierTable" class="fht-table table-striped" style="font-size: small;">
<thead> <thead>
<tr> <tr>
<th class="celda_encabezado_general" style="padding: 10px;">S.NO </th> <th class="celda_encabezado_general" style="padding: 10px;">S.NO </th>
<th class="celda_encabezado_general" style="padding: 10px;">IGR No </th> <th class="celda_encabezado_general" style="padding: 10px;">IGR No </th>
<th class="celda_encabezado_general" style="padding: 10px;">Invoice No</th> <th class="celda_encabezado_general" style="padding: 10px;">Invoice No</th>
<th class="celda_encabezado_general" style="padding: 10px;">Invoice Date</th> <th class="celda_encabezado_general" style="padding: 10px;">Invoice Date</th>
@ -262,14 +262,21 @@
$index++; ?> $index++; ?>
<tr id="<?php echo $row; ?>"> <tr id="<?php echo $row; ?>">
<!-- 'td:eq(0)' -->
<td width="45" height="45" class="celda_normal"><?php echo $index; ?></td> <td width="45" height="45" class="celda_normal"><?php echo $index; ?></td>
<!-- 'td:eq(1)' -->
<td class="celda_normal"> <td class="celda_normal">
<?php echo $record['IGRNO']??''; ?> <?php echo $record['IGRNO']??''; ?>
</td> </td>
<!-- 'td:eq(2)' -->
<td class="celda_normal" contenteditable="true"> <td class="celda_normal" contenteditable="true">
<?php echo $record['invoiceNo']??''; ?> <?php echo $record['invoiceNo']??''; ?>
</td> </td>
<!-- 'td:eq(3)' -->
<td class="celda_normal" contenteditable="true" > <td class="celda_normal" contenteditable="true" >
<?php <?php
$dateString = $record['invoiceDate']; $dateString = $record['invoiceDate'];
@ -278,7 +285,9 @@
?> ?>
<?php echo $record['invoiceDate']??''; ?> <?php echo $record['invoiceDate']??''; ?>
</td> </td>
<td class="celda_normal" onkeyup="gasPerTon(this.parentNode.id,this.textContent);" contenteditable="true" >
<!-- 'td:eq(4)' -->
<td class="celda_normal" contenteditable="true" >
<?php <?php
$dateString = $record['materialRecievedDate']; $dateString = $record['materialRecievedDate'];
$date = new DateTime($dateString); $date = new DateTime($dateString);
@ -287,87 +296,166 @@
<?php echo $record['materialRecievedDate']??''; ?> <?php echo $record['materialRecievedDate']??''; ?>
</td> </td>
<!-- 'td:eq(5)' -->
<td class="celda_normal"> <td class="celda_normal">
<?php echo $record['SupplierName']??''; ?> <?php echo $record['SupplierName']??''; ?>
</td> </td>
<td class="celda_normal" onkeyup="gasPerTon(this.parentNode.id, this.textContent); moistureLossQty(this.parentNode.id, this.textContent); qtyPerHrs(this.parentNode.id, this.textContent)" contenteditable="true" >
<!-- 'td:eq(6)' -->
<td class="celda_normal" contenteditable="true" >
<?php echo $record['grade']??''; ?> <?php echo $record['grade']??''; ?>
</td> </td>
<td class="celda_normal" >
<!-- 'td:eq(7)' -->
<td class="celda_normal" contenteditable="true" >
<?php echo $record['gradeCondition']??''; ?> <?php echo $record['gradeCondition']??''; ?>
</td> </td>
<td class="celda_normal" onkeyup="moistureLossQty(this.parentNode.id,this.textContent);" contenteditable="true" >
<!-- 'td:eq(8)' -->
<td class="celda_normal" contenteditable="true" >
<?php echo $record['VehicleNo']??''; ?> <?php echo $record['VehicleNo']??''; ?>
</td> </td>
<td class="celda_normal" >
<!-- calculateRow() for every td change below -->
<!-- 'td:eq(9)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['Qty']??'0'; ?> <?php echo $record['Qty']??'0'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true" >
<!-- 'td:eq(10)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);" >
<?php echo $record['_10']??'0.00'; ?> <?php echo $record['_10']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(11)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_20']??'0.00'; ?> <?php echo $record['_20']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(12)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_30']??'0.00'; ?> <?php echo $record['_30']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(13)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_40']??'0.00'; ?> <?php echo $record['_40']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(14)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_50']??'0.00'; ?> <?php echo $record['_50']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(15)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_70']??'0.00'; ?> <?php echo $record['_70']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(16)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_100']??'0.00'; ?> <?php echo $record['_100']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(17)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_140']??'0.00'; ?> <?php echo $record['_140']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(18)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_200']??'0.00'; ?> <?php echo $record['_200']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(19)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['_300']??'0.00'; ?> <?php echo $record['_300']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(20)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['pan']??'0.00'; ?> <?php echo $record['pan']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(21)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['total']??'0.00'; ?> <?php echo $record['total']??'0.00'; ?>
</td> </td>
<!-- 'td:eq(22)' -->
<td class="celda_normal" contenteditable="true"> <td class="celda_normal" contenteditable="true">
<?php echo $record['afsSpec']??'0.00'; ?> <?php echo $record['afsSpec']??'0.00'; ?>
</td> </td>
<!-- 'td:eq(23)' -->
<td class="celda_normal" contenteditable="true"> <td class="celda_normal" contenteditable="true">
<?php echo $record['afsActual']??'0.00'; ?> <?php echo $record['afsActual']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(24)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['plus20Loss']??'0.00'; ?> <?php echo $record['plus20Loss']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(25)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['plus30Loss']??'0.00'; ?> <?php echo $record['plus30Loss']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(26)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['moistureSpec']??'0.00'; ?> <?php echo $record['moistureSpec']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<?php echo $record['moistureSpec']??'0.00'; ?> <!-- 'td:eq(27)' -->
</td> <td class="celda_normal" contenteditable="true"
<td class="celda_normal" contenteditable="true"> onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['moistureActual']??'0.00'; ?> <?php echo $record['moistureActual']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(28)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['moistureLoss']??'0.00'; ?> <?php echo $record['moistureLoss']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(29)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['moistureLossQty']??'0.00'; ?> <?php echo $record['moistureLossQty']??'0.00'; ?>
</td> </td>
<td class="celda_normal" contenteditable="true">
<!-- 'td:eq(30)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['sieveLossQty']??'0.00'; ?>
</td>
<!-- 'td:eq(31)' -->
<td class="celda_normal" contenteditable="true"
onkeyup="calculateRow(this.parentNode.id);">
<?php echo $record['salableQty']??'0.00'; ?> <?php echo $record['salableQty']??'0.00'; ?>
</td> </td>
<!-- 'td:eq(32)' -->
<td class="celda_normal" contenteditable="true"> <td class="celda_normal" contenteditable="true">
<?php echo $record['Remarks']??''; ?> <?php echo $record['Remarks']??''; ?>
</td> </td>
@ -412,9 +500,6 @@
$(document).ready(function() $(document).ready(function()
{ {
$('.timeDropdown').select2({
placeholder: "Select a time",
});
$('#save').click(function() { $('#save').click(function() {
@ -527,7 +612,7 @@
let [hours, minutes] = timePart.split(":"); let [hours, minutes] = timePart.split(":");
// Convert hours to a number // Convert hours to a number
hours = parseInt(hours, 10); hours = parseFloat(hours, 10);
// Adjust hours based on AM/PM // Adjust hours based on AM/PM
if (modifier === "PM" && hours < 12) { if (modifier === "PM" && hours < 12) {
@ -563,6 +648,66 @@ function gasPerTon(parentId , textContent) {
tr.find('td:eq(8)').text(0.0); tr.find('td:eq(8)').text(0.0);
} }
}
function calculateRow(rowId){
var tr=$(`#`+rowId);
var qty=tr.find('td:eq(9)').text();
var _10 = tr.find('td:eq(10)').text();
var _20 = tr.find('td:eq(11)').text();
var _30 = tr.find('td:eq(12)').text();
var _40 = tr.find('td:eq(13)').text();
var _50 = tr.find('td:eq(14)').text();
var _70 = tr.find('td:eq(15)').text();
var _100 = tr.find('td:eq(16)').text();
var _140 = tr.find('td:eq(17)').text();
var _200 = tr.find('td:eq(18)').text();
var _300 = tr.find('td:eq(19)').text();
var pan = tr.find('td:eq(20)').text();
var total = tr.find('td:eq(21)').text();
var afsSpec = tr.find('td:eq(22)').text();
var afsActual = tr.find('td:eq(23)').text();
var plus20Loss = tr.find('td:eq(24)').text();
var plus30Loss = tr.find('td:eq(25)').text();
var moistureSpec = tr.find('td:eq(26)').text();
var moistureActual = tr.find('td:eq(27)').text();
var moistureLoss = tr.find('td:eq(28)').text();
var moistureLossQty = tr.find('td:eq(29)').text();
var sieveLossQty = tr.find('td:eq(30)').text();
var salableQty = tr.find('td:eq(31)').text();
let newTotal =parseFloat(_10) +parseFloat(_20) +parseFloat(_30) +parseFloat(_40) +parseFloat(_50) +parseFloat(_70) +parseFloat(_100) +
parseFloat(_140) +parseFloat(_200) +parseFloat(_300) +parseFloat(pan);
//total td
tr.find('td:eq(21)').text(newTotal);
let newPlus20Loss = parseFloat(_10) +parseFloat(_20) ;
//plus20Loss td
tr.find('td:eq(24)').text(newPlus20Loss);
let newPlus30Loss = parseFloat(_10) +parseFloat(_20) + parseFloat(_30) ;
//plus30Loss td
tr.find('td:eq(25)').text(newPlus30Loss);
let newMoistureLoss = parseFloat(moistureActual) - parseFloat(moistureSpec) ;
//moistureLoss td
tr.find('td:eq(28)').text(newMoistureLoss);
let newMoistureLossQty = Math.round((parseFloat(qty) * newMoistureLoss) / 100 ) ;
//moistureLossqty td
tr.find('td:eq(29)').text(newMoistureLossQty.toLocaleString());
let newSieveLossQty = Math.floor((parseFloat(qty) * newPlus30Loss) / 100) ;
//sieveLossQty td
tr.find('td:eq(30)').text(newSieveLossQty.toLocaleString());
let newSalableQty = Math.floor(parseFloat(qty) - newMoistureLossQty - newSieveLossQty) ;
//salableQty td
tr.find('td:eq(31)').text(newSalableQty.toLocaleString());
} }
function moistureLossQty(parentId , textContent) { function moistureLossQty(parentId , textContent) {