From eabe4c020c2eb05b968e2855f8f49fc3aa477095 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 16 Aug 2018 14:30:09 +0530 Subject: [PATCH] average --- application/controllers/batchcard.php | 13 + .../controllers/rawmaterialdetails.php | 3 +- application/models/batchcard_model.php | 12 + .../models/rawmaterialdetails_model.php | 12 + application/views/FinalProduct.php | 378 +++++++++++++- application/views/addRawMaterial.php | 462 +++++++++--------- application/views/editFinalProduct.php | 89 ++++ application/views/editRawmaterial.php | 106 ++-- 8 files changed, 804 insertions(+), 271 deletions(-) diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index eda7c00b..0677ce3b 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -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); + + } + } ?> \ No newline at end of file diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index 60ec2de7..f7a0375b 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -324,7 +324,8 @@ else $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM); $data['costcentercode'] =$this->rawmaterialdetails_model->getCostCenterCode(); $data['cfUOM'] = $this->rawmaterialdetails_model->getConversionfactorUOM(); - $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode(); + $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); diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index 147523df..c52f4f64 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -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(); + } + } diff --git a/application/models/rawmaterialdetails_model.php b/application/models/rawmaterialdetails_model.php index c2667012..cb4d24bb 100755 --- a/application/models/rawmaterialdetails_model.php +++ b/application/models/rawmaterialdetails_model.php @@ -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(); + } } ?> \ No newline at end of file diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php index a12ff5f3..888d5cf1 100755 --- a/application/views/FinalProduct.php +++ b/application/views/FinalProduct.php @@ -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:"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:"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:"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_yeartoday_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:"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_yeartoday_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:"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,7 +2812,26 @@ function EditResultantQty(materialtype) var editmaterialcode = $('#Editpackumaterialcode').val(); var editsupplier =$('#EditpackSupplier').val(); - if(((editmaterialcode != 0)&&(editsupplier != 0))) + 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))) { //alert("add"); @@ -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_yeartoday_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:"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)) + } + + }); + + } + +} +}); } diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index 35f8b5b8..2beabaa4 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -20,254 +20,268 @@ $(function() {

-
+ +

-
- Back -
-
-
- -
- -
- - - -
-
-
-
-
- * - -
+
+ Back +
+
+
+ +
+ +
+ + + + +
+
+
+
+ * + +
+
+ +
+
+ * + +
+
+ +
+
+ * + + + +
+
+ + + +
+
+ * + +
+
-
-
- * - -
-
+
-
-
- * - - - -
-
- - + if(!empty($assetcode)) + { + foreach ($assetcode as $AC) + { + ?> + + + +
+
+ +
+
+ + +
+
-
-
- * - -
-
-
+
+
+ + +
+
-
+
+
+ + +
+
-
-
- - -
-
- -
-
- - -
-
-
-
- - -
-
-
-
- - -
-
+
-
- - -
-
-
-
- - -
-
-
- - 'Date','value' => set_value('Date'),'id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;'); - echo form_input($data); - ?> -
-
-
- - -
-
+
+ + +
-
+ +
+
+ + +
+
+ +
+ + 'Date','value' => set_value('Date'),'id'=>'Date', 'class' => 'form-control' , 'onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+ +
+
+ + +
+
+ +
+ +
-
- - +
+ + +
+
+ +
+
+
+ +
-
-
-
-
-
-
+
+ + +
+ +
-
-
- -
- - - -
- + + + +
-
-
- load->helper('form'); - $error = $this->session->flashdata('error'); - if($error) - { - ?> -
- - session->flashdata('error'); ?> + +
+ load->helper('form'); + $error = $this->session->flashdata('error'); + if($error) + { + ?> +
+ + session->flashdata('error'); ?> +
+ + session->flashdata('success'); + if($success) + { + ?> +
+ + session->flashdata('success'); ?> +
+ + +
+
+ ', '
'); ?> +
- - session->flashdata('success'); - if($success) - { - ?> -
- - session->flashdata('success'); ?>
- - -
-
- ', '
'); ?> -
-
-
-
+ +
diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php index d0d42b10..771f58b7 100755 --- a/application/views/editFinalProduct.php +++ b/application/views/editFinalProduct.php @@ -2044,6 +2044,36 @@ function ResultantQty(materialtype) } }); + $.ajax({ + +data:{materialcode:materialcode,Supplier:supplier,date:today}, +type:"POST", +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:"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:"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)) + } + + }); + + } + +} +}); } } diff --git a/application/views/editRawmaterial.php b/application/views/editRawmaterial.php index d4eb9de4..68006e54 100755 --- a/application/views/editRawmaterial.php +++ b/application/views/editRawmaterial.php @@ -52,6 +52,9 @@ if(!empty($materialDetails)) } } } +$Average_Price =$avg_price[0]['avg_rate']; + +$Average_Value = number_format( $Average_Price,2, '.', ''); if(!empty($currentstock)) { @@ -172,47 +175,46 @@ $("#Date").datepicker({ -
-
-
- - -
-
+
+
+
+ + +
+
-
-
- * - -
-
+
+
+ * + +
+
-
- * - + + -
+ ?> + +
-
@@ -230,12 +232,14 @@ $("#Date").datepicker({
+
+
@@ -244,6 +248,7 @@ $("#Date").datepicker({
+
@@ -253,7 +258,8 @@ $("#Date").datepicker({
- + +
@@ -264,6 +270,7 @@ $("#Date").datepicker({
+
@@ -279,14 +286,16 @@ $("#Date").datepicker({ echo form_input($data); } ?> +
- +
+
@@ -296,18 +305,28 @@ $("#Date").datepicker({
-
-
- - -
-
+
-
- > + +
+
+ +
+
+ + +
+
+ +
+
+
+ > +
+ @@ -321,7 +340,7 @@ $("#Date").datepicker({ -
+ @@ -400,7 +419,12 @@ $(document).ready(function(){ }); $('#conversionfactorUOM option[value=""]').prop('selected', true); - + var x = $("#MaterialCategory").val() == 'Spares'; + if(x) + { + $('#Assetcode').prop('disabled', false); + $('#Costcenter').prop('disabled', false); + } }); function onlyAlphabets(evt) {