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

stock detail - issues fixes

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-07-06 14:56:55 +05:30
parent 7ffb574094
commit f17ccdb5a6
9 changed files with 100 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/emergencypurchaseorder.php
View File

@ -610,9 +610,11 @@ $RequestedBy = $this->input->post('drpDepartment');
$IGRItemNo = $value->IGRItemNo; $IGRItemNo = $value->IGRItemNo;
} }
$MaterialstockHistoryadd= array('Ref_No'=>$IGRItemNo,'MaterialCode'=>$MaterialCode,'Transaction_type'=>'Add','Ref_Type'=>'IGR','SupplierID'=>$SupplierID,'Quantity'=>$QuantityAsPerInvoice,'ItemValue'=>$itemRate,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
$this->inwardgateregister_model->addMaterialStockHistory($MaterialstockHistoryadd);
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode); $Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
$ReceivedQuantity = 0.00; $ReceivedQuantity = 0.00;
if(count($Recqty)>0) if(count($Recqty)>0)
{ {
foreach ($Recqty as $key ) { foreach ($Recqty as $key ) {

35
application/controllers/inwardgateregister.php
View File

@ -172,6 +172,9 @@ class inwardgateregister extends BaseController
$igrM = $this->inwardgateregister_model->addigrM($igr); $igrM = $this->inwardgateregister_model->addigrM($igr);
$OGRStatus=IGR_CREATED;
$check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$OGRStatus);
$IGRNO = ''; $IGRNO = '';
if(count($igrM)>0) if(count($igrM)>0)
{ {
@ -210,8 +213,33 @@ class inwardgateregister extends BaseController
$igrDetails = array('IGRNO'=>$IGRNO,'MaterialCode'=>$MaterialCode,'QuantityAsPerInvoice'=>$QuantityAsPerInvoice,'Remarks'=>$Remarks,'IGRItemStatus'=>$IGRItemStatus,'CreatedBy'=>$CreatedBy,'CreatedDate'=>$createddt); $igrDetails = array('IGRNO'=>$IGRNO,'MaterialCode'=>$MaterialCode,'QuantityAsPerInvoice'=>$QuantityAsPerInvoice,'Remarks'=>$Remarks,'IGRItemStatus'=>$IGRItemStatus,'CreatedBy'=>$CreatedBy,'CreatedDate'=>$createddt);
$igrD = $this->inwardgateregister_model->addigrD($igrDetails); $igrD = $this->inwardgateregister_model->addigrD($igrDetails);
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
$ReceivedQuantity = 0.00; $igrlineno ='';
if(!empty($igrD))
{
foreach($igrD as $ig)
{
$igrlineno = $ig->IGRItemNo;
}
}
$itemvalue='';
$SupplierId='';
$polineitemvalue = $this->inwardgateregister_model->getitemvalue($PONO,$MaterialCode);
foreach($polineitemvalue as $it)
{
$itemvalue =$it->Rate;
$SupplierId =$it->SupplierID;
}
$historydetails = array('MaterialCode'=>$MaterialCode,'Transaction_type'=>"Add",'Ref_Type'=>"IGR",'Ref_No'=>$igrlineno,'Quantity'=>$QuantityAsPerInvoice,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt,'SupplierID'=>$SupplierId,'ItemValue'=>$itemvalue);
$this->inwardgateregister_model->addmaterialhistory($historydetails);
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
$ReceivedQuantity = 0.00;
if(count($Recqty)>0) if(count($Recqty)>0)
{ {
@ -284,8 +312,7 @@ class inwardgateregister extends BaseController
$this->load->model('inwardgateregister_model'); $this->load->model('inwardgateregister_model');
$this->global['pageTitle'] = $this->CompanyName.' : Add Outward Gate Register'; $this->global['pageTitle'] = $this->CompanyName.' : Add Outward Gate Register';
//$data['Customer'] = $this->inwardgateregister_model->getCustomer();
$data['Customer'] = $this->inwardgateregister_model->getCustomer();
$data['Supplier'] = $this->inwardgateregister_model->getSupplier(); $data['Supplier'] = $this->inwardgateregister_model->getSupplier();
$data['storedmaterialcode'] = $this->inwardgateregister_model->getstoredmaterialcode(); $data['storedmaterialcode'] = $this->inwardgateregister_model->getstoredmaterialcode();

8
application/controllers/purchaseorder.php
View File

@ -1299,14 +1299,14 @@ class purchaseorder extends BaseController
$this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs); $this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'],$IGRDs);
// $MaterialstockHistoryupdate= array('SupplierID'=>$SupplierID,'Quantity'=>$Quantity,'ItemValue'=>$itemRate,'UpdateBY'=>$updatedBy,'UpdatedOn'=>$updateddt); $MaterialstockHistoryupdate= array('SupplierID'=>$SupplierID,'Quantity'=>$Quantity,'ItemValue'=>$itemRate,'UpdatedBY'=>$updatedBy,'UpdatedOn'=>$updateddt);
// $itemNo = $IGRD[$j]['IGRItemNo']; $itemNo = $IGRD[$j]['IGRItemNo'];
// $this->purchaseorder_model->updateMatStock($itemNo, $this->purchaseorder_model->updateMatStock($itemNo,
// $MaterialstockHistoryupdate); $MaterialstockHistoryupdate);

14
application/models/inwardgateregister_model.php
View File

@ -9,19 +9,19 @@ class inwardgateregister_model extends CI_Model
// } // }
function updatefile($bill,$Picture,$oldfile) function updatefile($bill,$Picture,$oldfile)
{ {
// if($oldfile != ''){ // if($oldfile != ''){
// //unlink("uploads/BillFiles/".$oldfile);//this deletes the file on particular folder too // //unlink("uploads/BillFiles/".$oldfile);//this deletes the file on particular folder too
// } // }
$this->db->set('FilePath', $Picture); //value that used to update column $this->db->set('FilePath', $Picture); //value that used to update column
$this->db->where('BillNo', $bill); //which row want to upgrade $this->db->where('BillNo', $bill); //which row want to upgrade
$this->db->update('T_Inwardgateregister_fileupload'); $this->db->update('T_Inwardgateregister_fileupload');
$afftectedRows = $this->db->affected_rows(); $afftectedRows = $this->db->affected_rows();
return $afftectedRows; return $afftectedRows;
} }
function getfies($igr) function getfies($igr)

8
application/models/purchaseorder_model.php
View File

@ -38,6 +38,14 @@ class purchaseorder_model extends CI_Model
return $query->result(); return $query->result();
} }
function updateMatStock($itemNo,$MaterialstockHistoryupdate){
$this->db->where('Ref_No',$itemNo);
$this->db->update('T_Material_stock_history', $MaterialstockHistoryupdate);
$r = $this->db->affected_rows();
return $r;
}
function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){ function updateReqDetails($Reqnumber,$MaterialCode,$ReqDetail){
$this->db->where('ReqNo',$Reqnumber); $this->db->where('ReqNo',$Reqnumber);

23
application/views/editogr.php
View File

@ -168,8 +168,7 @@ if(!empty($OGR_Data))
<div id="content"></div> <div id="content"></div>
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header"><?php echo $pageTitle; ?></h3></center>
<center><h3 class="box-title">Siddharth Industries - Outward Gate Register(OGR)Entry </h3></center>
</div> </div>
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
@ -216,8 +215,8 @@ if(!empty($OGR_Data))
<div class="form-group"> <div class="form-group">
<!-- <!--
<?php <?php
$data = array('name' => 'date','value' => set_value('date',$date),'id'=>'date', 'class' => 'form-control'); //$data = array('name' => 'date','value' => set_value('date',$date),'id'=>'date', 'class' => 'form-control');
echo form_input($data); //echo form_input($data);
?> --> ?> -->
@ -329,8 +328,8 @@ if(!empty($OGR_Data))
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'orderqty','value' => set_value('orderqty'),'id'=>'orderqty', 'class' => 'form-control'); //$data = array('name' => 'orderqty','value' => set_value('orderqty'),'id'=>'orderqty', 'class' => 'form-control');
echo form_input($data); //echo form_input($data);
?> ?>
</div> </div>
@ -342,8 +341,8 @@ if(!empty($OGR_Data))
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty', 'class' => 'form-control'); //$data = array('name' => 'Rejectqty','value' => set_value('Rejectqty'),'id'=>'Rejectqty', 'class' => 'form-control');
echo form_input($data); //echo form_input($data);
?> ?>
</div> </div>
@ -368,8 +367,8 @@ if(!empty($OGR_Data))
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'destination','value' => set_value('destination',$sup),'id'=>'destination', 'class' => 'form-control'); //$data = array('name' => 'destination','value' => set_value('destination',$sup),'id'=>'destination', 'class' => 'form-control');
echo form_input($data); //echo form_input($data);
?> --> ?> -->
<label>Remarks</label> <label>Remarks</label>
@ -503,8 +502,8 @@ if(!empty($OGR_Data))
<?php <?php
$data = array('name' => 'materialcode','value' => set_value('materialcode'),'id'=>'materialcode', 'class' => 'form-control'); //$data = array('name' => 'materialcode','value' => set_value('materialcode'),'id'=>'materialcode', 'class' => 'form-control');
echo form_input($data); //echo form_input($data);
?> ?>

3
application/views/materialadjustmentlist.php
View File

@ -92,7 +92,8 @@
<div class="modal-content" style="width:900px;"> <div class="modal-content" style="width:900px;">
<div class="modal-header" style="background-color: #5d0411;color:#fff;"> <div class="modal-header" style="background-color: #5d0411;color:#fff;">
<button type="button" class="close" data-dismiss="modal">&times;</button> <button type="button" class="close" data-dismiss="modal">&times;</button>
<center><h4>Material Adjustment Report</h4></center> <!-- <center><h4>Material Adjustment Report</h4></center> -->
<center><h4><?php echo $pageTitle; ?></h4></center>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">

29
application/views/ogr.php
View File

@ -163,6 +163,7 @@ $Value="&#8377;";
<?php <?php
//$options = array("0"=>'Select'); //$options = array("0"=>'Select');
//echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2'); //echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
?> ?>
</div> --> </div> -->
@ -568,20 +569,12 @@ $("#ogrtype").change(function()
$('#saveinv').show(); $('#saveinv').show();
$('#saveservice').hide(); $('#saveservice').hide();
//document.getElementById("sup").options.length = 0; //document.getElementById("sup").options.length = 0;
$('#sup').find('option:not(:first)').remove(); // $('#sup').find('option:not(:first)').remove();
var customer= <?php echo json_encode($Customer, JSON_PRETTY_PRINT) ?>; // var customer= <?php //echo json_encode($Customer, JSON_PRETTY_PRINT) ?>;
// $.each(customer, function(cu, cuobj)
$.each(customer, function(cu, cuobj) // {
// $("#sup").append( $('<option></option>').val(cuobj.client_id).html(cuobj.client_name));
{ // });
$("#sup").append( $('<option></option>').val(cuobj.client_id).html(cuobj.client_name));
});
} }
else if ($('#ogrtype').val()=="2") else if ($('#ogrtype').val()=="2")
@ -622,7 +615,6 @@ $("#ogrtype").change(function()
} }
else else
{ {
$('#mv').hide(); $('#mv').hide();
@ -676,7 +668,6 @@ $("#sup").change(function()
} }
else if($('#ogrtype').val()=="2") else if($('#ogrtype').val()=="2")
{ {
var supplier= $('#sup').val(); var supplier= $('#sup').val();
@ -811,9 +802,9 @@ $("#mrirno").change(function()
$("#pono").change(function() $("#pono").change(function()
{ {
alert('onchange function entered'); //alert('onchange function entered');
var PONO=$('#pono').val(); var PONO=$('#pono').val();
alert(PONO); // alert(PONO);
$('#poappend').empty(); $('#poappend').empty();
var row= $('#rowcount').val(); var row= $('#rowcount').val();
@ -897,7 +888,7 @@ function addHidden(theForm, key, value)
var materialcode=$('#materialcode').val(); var materialcode=$('#materialcode').val();
var mrirno = $('#mrirno').val(); var mrirno = $('#mrirno').val();
var PONO=$('#pono').val(); var PONO=$('#pono').val();
alert(mrirno+''+materialcode+''+PONO); // alert(mrirno+''+materialcode+''+PONO);
var x = document.getElementById("potable").rows.length; var x = document.getElementById("potable").rows.length;
for(var i=1;i<=x;i++) for(var i=1;i<=x;i++)

25
application/views/viewIGRDetails.php
View File

@ -190,6 +190,16 @@
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label>
<?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
echo form_input($data);
?>
</div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4">
<label>Delivery Challan/Invoice NO </label> <label>Delivery Challan/Invoice NO </label>
<?php <?php
$data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'DeliveryChallan/InvoiceNO','value' => set_value('DeliveryChallan/InvoiceNO'),'id'=>'Invoice_No', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' );
@ -197,8 +207,6 @@
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div>
<div class="col-md-12" style=" padding-bottom: 10px;">
<div class="col-md-4"> <div class="col-md-4">
<label>Delivery Challan / Invoice Date </label> <label>Delivery Challan / Invoice Date </label>
<?php <?php
@ -208,9 +216,9 @@
?> ?>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label>Supplier Name </label> <label>Material Received Date </label>
<?php <?php
$data = array('name' => 'SupplierName','value' => set_value('SupplierName'),'id'=>'Supplier', 'class' => 'form-control', 'required=>"true"' , 'readonly'=>'true' ); $data = array('name' => 'MaterialRcvdDate','value' => set_value('MaterialRcvdDate'),'id'=>'MaterialRcvdDate', 'class' => 'form-control' , 'readonly'=>'true' );
echo form_input($data); echo form_input($data);
?> ?>
@ -223,7 +231,7 @@
<table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;"> <table class="table table-bordered" id="Inwardgateregistertable1" style="font-size:12px;">
<thead style="background-color:#ddf"> <thead style="background-color:#ddf">
<tr> <tr>
<!-- <th>SNo</th> --> <th>SNo</th>
<th>Item Code</th> <th>Item Code</th>
<th>Item Description</th> <th>Item Description</th>
<th>UOM</th> <th>UOM</th>
@ -336,6 +344,13 @@ $("#Igrshow").on("shown.bs.modal", function(e) {
//alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear()); //alert(dcd.getDate()+ '.' + (dcd.getMonth() + 1)+ '.' + dcd.getFullYear());
var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear()); var dcd2 = (dcd.getDate()+ '/' + (dcd.getMonth() + 1)+ '/' + dcd.getFullYear());
$("#Invoice_Date").val(dcd2); $("#Invoice_Date").val(dcd2);
if(item.MaterialRcvdDate === null) {
var Mat_rcv_date = ' '; }
else {
var MR_dt = new Date(item.MaterialRcvdDate);
var Mat_rcv_date = (MR_dt.getDate()+ '/' + (MR_dt.getMonth() + 1)+ '/' + MR_dt.getFullYear());
}
$("#MaterialRcvdDate").val(Mat_rcv_date);
$("#ser").val(item.ServiceDescription); $("#ser").val(item.ServiceDescription);