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

average

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-08-16 14:30:09 +05:30
parent e4847e4918
commit eabe4c020c
8 changed files with 804 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
application/controllers/batchcard.php
View File

@ -856,6 +856,19 @@ if((count($materialadjust)>0) &&(count($historyadd)))
$this->loadViews("editmaterialadjustment", $this->global,$data,NULL);
}
//this function user to materialmaster avg price
function getAvgPrice()
{
$MaterialCode = $this->input->post('materialcode');
$date = $this->input->post('date');
$Supplier = $this->input->post('Supplier');
$pricearray = $this->batchcard_model->GetAvgPrice($MaterialCode,$date,$Supplier);
echo json_encode($pricearray);
}
}
?>

1
application/controllers/rawmaterialdetails.php
View File

@ -325,6 +325,7 @@ else
$data['costcentercode'] =$this->rawmaterialdetails_model->getCostCenterCode();
$data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM();
$data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode();
$data['avg_price'] = $this->rawmaterialdetails_model->getMaterialAvg($RawMaterialID);
//$this->global['pageTitle'] = 'Resico : Edit Material Master';
$this->global['pageTitle'] = $this->CompanyName.' : Edit Material Master';
$this->loadViews("editRawmaterial", $this->global,$data, NULL);

12
application/models/batchcard_model.php
View File

@ -691,6 +691,18 @@ class batchcard_model extends CI_Model
return TRUE;
}
//this function user to view rawmaterial average price value display
function GetAvgPrice($MaterialCode,$date,$Supplier)
{
$subQuery='select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem
join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
where MaterialCode = ? and SupplierID=?';
$query = $this->db->query($subQuery,array($MaterialCode,$Supplier));
//print_r($this->db->last_query());
return $query->result_array();
}
}

12
application/models/rawmaterialdetails_model.php
View File

@ -256,5 +256,17 @@ class rawmaterialdetails_model extends CI_Model
return $query->result();
}
//this function user to view rawmaterial average price value display
function getMaterialAvg($RawMaterialID)
{
$subQuery='select AVG(Rate) as avg_rate from T_PurchaseOrder_LineItem
join T_PurchaseOrder_Master on T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO
where MaterialCode = ?';
$query = $this->db->query($subQuery,array($RawMaterialID));
//print_r($this->db->last_query());
return $query->result_array();
}
}
?>

374
application/views/FinalProduct.php
View File

@ -1837,6 +1837,38 @@ $('#EditrawSupplier').change(function()
});
$('#EditconsuSupplier').change(function()
{
var type = "consumables";
EditResultantQty(type);
});
$('#Editconsumaterialcode').change(function()
{
var type = "consumables";
EditResultantQty(type);
});
$('#EditpackSupplier').change(function()
{
var type = "packing";
EditResultantQty(type);
});
$('#Editpackumaterialcode').change(function()
{
var type = "packing";
EditResultantQty(type);
});
var today = new Date();
var dd = today.getDate();
@ -2021,6 +2053,38 @@ function ResultantQty(materialtype)
}
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#rawprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#rawprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
@ -2168,10 +2232,44 @@ var stock_date_date = '';
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#consuprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#consuprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
}
@ -2312,7 +2410,36 @@ var stock_date_date = '';
}
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#packprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#packprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
}
@ -2358,7 +2485,26 @@ function EditResultantQty(materialtype)
}
today = yyyy+'-'+mm+'-'+dd;
var stock_date = '';
var stock_date_year = '';
var stock_date_month = '';
var stock_date_date = '';
$.each(stock,function(j,fnobj)
{
if(editmaterialcode == fnobj.MaterialCode)
{
openqty = fnobj.stock == '' ? '0' : fnobj.stock;
stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
var split = stock_date.split('-');
stock_date_year = split[0];
stock_date_month = split[1];
stock_date_date = split[2];
//console.log(openqty);
}
})
//alert(today)
//today = mm+'-'+dd+'-'+yyyy;
@ -2393,10 +2539,46 @@ function EditResultantQty(materialtype)
{
reduceqty=0;
}
if(openqty == null)
{
openqty=0;
}
});
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
if(stock_date_year==today_year)
{
if(stock_date_month<=03)
{
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
}
}
else if(stock_date_year<today_year)
{
//$total= $y;
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else if(stock_date_year>today_year)
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
}
// var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
if(isNaN(resultantqty))
{
$('#Editrawqty').val(0);
@ -2418,7 +2600,36 @@ function EditResultantQty(materialtype)
}
});
$.ajax({
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#Editrawprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#Editrawprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
}
@ -2428,7 +2639,26 @@ function EditResultantQty(materialtype)
{
var editmaterialcode = $('#Editconsumaterialcode').val();
var editsupplier =$('#EditconsuSupplier').val();
var stock_date = '';
var stock_date_year = '';
var stock_date_month = '';
var stock_date_date = '';
$.each(stock,function(j,fnobj)
{
if(editmaterialcode == fnobj.MaterialCode)
{
conopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
//console.log(openqty);
stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
var split = stock_date.split('-');
stock_date_year = split[0];
stock_date_month = split[1];
stock_date_date = split[2];
}
})
if(((editmaterialcode != 0)&&(editsupplier != 0)))
{
@ -2484,9 +2714,39 @@ function EditResultantQty(materialtype)
{
reduceqty=0;
}
if(conopenqty == null)
{
conopenqty=0;
}
});
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
// var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
if(stock_date_year==today_year)
{
if(stock_date_month<=03)
{
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
}
}
else if(stock_date_year<today_year)
{
//$total= $y;
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else if(stock_date_year>today_year)
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
}
if(isNaN(resultantqty))
{
@ -2509,6 +2769,36 @@ function EditResultantQty(materialtype)
}
});
$.ajax({
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#Editconsuprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#Editconsuprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
@ -2522,6 +2812,25 @@ function EditResultantQty(materialtype)
var editmaterialcode = $('#Editpackumaterialcode').val();
var editsupplier =$('#EditpackSupplier').val();
var stock_date = '';
var stock_date_year = '';
var stock_date_month = '';
var stock_date_date = '';
$.each(stock,function(j,fnobj)
{
if(editmaterialcode == fnobj.MaterialCode)
{
packopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
//console.log(openqty);
stock_date = fnobj.stockdate == ''?'0':fnobj.stockdate;
var split = stock_date.split('-');
stock_date_year = split[0];
stock_date_month = split[1];
stock_date_date = split[2];
}
})
if(((editmaterialcode != 0)&&(editsupplier != 0)))
{
@ -2577,9 +2886,38 @@ function EditResultantQty(materialtype)
{
reduceqty=0;
}
if(packopenqty == null)
{
packopenqty=0;
}
});
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
//var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
if(stock_date_year==today_year)
{
if(stock_date_month<=03)
{
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
}
}
else if(stock_date_year<today_year)
{
//$total= $y;
var resultantqty= parseFloat(addqty)- parseFloat(reduceqty);
}
else if(stock_date_year>today_year)
{
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
}
if(isNaN(resultantqty))
{
@ -2602,6 +2940,36 @@ function EditResultantQty(materialtype)
}
});
$.ajax({
data:{materialcode:editmaterialcode,Supplier:editsupplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#Editpackprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#Editpackprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}

20
application/views/addRawMaterial.php
View File

@ -20,6 +20,7 @@ $(function() {
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<center><?php echo $pageTitle?></center>
</h1>
@ -160,12 +161,14 @@ $(function() {
</select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Conversion Factor</label>
<input type="text" class="form-control" id="conversionfactor" name="conversionfactor" maxlength="255">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactorUOM">Conversion Factor UOM</label>
@ -185,7 +188,9 @@ $(function() {
</select>
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-3">
<div class="form-group">
@ -193,12 +198,14 @@ $(function() {
<input type="text" class="form-control" id="HSNcode" onkeypress="return isNumberKey(event)" name="HSNcode" maxlength="8">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Opening Stock</label>
<input type="text" class="form-control" id="openstock" name="openstock" maxlength="255">
</div>
</div>
<div class="col-md-3">
<label>Open Stock Date</label>
<?php
@ -206,13 +213,16 @@ $(function() {
echo form_input($data);
?>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Reorder Level</label>
<input type="text" class="form-control" id="reorder" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-6">
<div class="form-group">
@ -220,6 +230,7 @@ $(function() {
<input type="text" class="form-control" id="remarks" name="remarks" maxlength="255">
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="Active">IsActive</label> <br>
@ -227,17 +238,19 @@ $(function() {
</div>
</div>
</div>
</div>
</div><!-- /.box-body -->
<div class="box-footer" style="text-align:right">
<input type="reset" class="btn btn-primary" value="Reset" />
<input type="submit" onclick="Validate();" value="Submit" class="btn btn-primary">
</div>
</form>
</div>
</form>
</div>
</div>
<div class="col-md-4">
<?php
$this->load->helper('form');
@ -267,6 +280,7 @@ $(function() {
</div>
</div>
</div>
</div>
</section>

89
application/views/editFinalProduct.php
View File

@ -2044,6 +2044,36 @@ function ResultantQty(materialtype)
}
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#rawprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#rawprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
@ -2189,6 +2219,36 @@ var stock_date = '';
}
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#consuprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#consuprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
@ -2336,7 +2396,36 @@ var stock_date_date = '';
}
});
$.ajax({
data:{materialcode:materialcode,Supplier:supplier,date:today},
type:"POST",
url:"<?php echo base_url() ?>batchcard/getAvgPrice",
success:function(data) {
if(data)
{
var avg_price = 0;
$.each(JSON.parse(data),function(i,obj)
{
avg_price = parseFloat(obj.avg_rate);
if(isNaN(avg_price))
{
$('#packprice').val(parseFloat(0).toFixed(2))
}
else
{
$('#packprice').val(parseFloat(avg_price).toFixed(2))
}
});
}
}
});
}
}

34
application/views/editRawmaterial.php
View File

@ -52,6 +52,9 @@ if(!empty($materialDetails))
}
}
}
$Average_Price =$avg_price[0]['avg_rate'];
$Average_Value = number_format( $Average_Price,2, '.', '');
if(!empty($currentstock))
{
@ -212,7 +215,6 @@ $("#Date").datepicker({
<div class="col-md-12">
<div class="col-md-3">
<div class="form-group">
<label for="assetcode">Asset Code</label>
@ -230,12 +232,14 @@ $("#Date").datepicker({
</select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Conversion Factor</label>
<input type="text" class="form-control" id="conversionfactor" name="conversionfactor" maxlength="255" value="<?php echo $conversionfactor;?>" >
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactorUOM">Conversion Factor UOM</label>
@ -244,6 +248,7 @@ $("#Date").datepicker({
</select>
</div>
</div>
</div>
<div class="col-md-12">
@ -254,6 +259,7 @@ $("#Date").datepicker({
<input type="text" class="form-control" id="HSNcode" name="HSNcode" maxlength="8" value="<?php echo $HSNcode; ?>" onkeypress="return isNumberKey(event)" >
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="openstock">Opening Stock</label>
@ -264,6 +270,7 @@ $("#Date").datepicker({
<?php } ?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="openstockdate" >Open Stock Date</label>
@ -281,12 +288,14 @@ $("#Date").datepicker({
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label for="reorderlevel">Reorder Level</label>
<input type="text" class="form-control" id="reorder" value="<?php echo $reorder;?>" name="reorder" maxlength="255">
</div>
</div>
</div>
<div class="col-md-12">
@ -296,18 +305,28 @@ $("#Date").datepicker({
<input type="text" class="form-control" id="currentstock" readonly value="<?php echo $total; ?>" name="currentstock" maxlength="255">
</div>
</div>
<div class="col-md-6">
<div class="col-md-3">
<div class="form-group">
<label for="conversionfactor">Average Price</label>
<input type="text" class="form-control" id="avg_price" readonly value="<?php echo $Average_Value?>" name="avg_price" maxlength="255">
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label for="remarks">Remarks</label>
<input type="text" class="form-control" id="remarks" name="remarks" maxlength="255" value="<?php echo $remarks;?>">
</div>
</div>
<div class="col-md-3">
<div class="col-md-1">
<div class="form-group">
<label for="Active">IsActive</label> <br/>
<input type="checkbox" id="isactive" name="isactive" <?php echo $IsActive; ?> >
</div>
</div>
</div>
@ -321,7 +340,7 @@ $("#Date").datepicker({
</form>
</div>
</div>
<div class="col-md-4"></div>
<!-- <div class="col-md-4"></div> -->
</div>
</section>
</div>
@ -400,7 +419,12 @@ $(document).ready(function(){
});
$('#conversionfactorUOM option[value="<?php echo $conversionfactorUOM?>"]').prop('selected', true);
var x = $("#MaterialCategory").val() == 'Spares';
if(x)
{
$('#Assetcode').prop('disabled', false);
$('#Costcenter').prop('disabled', false);
}
});
function onlyAlphabets(evt) {