From b6b6a6cd27327e8fc41835acac5ed87008e90ee2 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Mon, 9 Jul 2018 15:42:28 +0530
Subject: [PATCH] final product screen stock value

---
 application/controllers/batchcard.php    |  4 +-
 application/views/FinalProduct.php       | 80 ++++++++++++++++++++----
 application/views/editFinalProduct.php   | 69 +++++++++++++++++---
 application/views/materialadjustment.php | 10 ++-
 4 files changed, 142 insertions(+), 21 deletions(-)

diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index 69f102c3..249ca1aa 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -1281,6 +1281,7 @@ class batchcard extends BaseController
 		$data['Raw_material'] = $this->batchcard_model->get_rawmaterials();
 		$data['Pack_material'] = $this->batchcard_model->get_packmaterials();
 		$data['supplier'] = $this->batchcard_model->getSupplierlist();
+		$data['stock_value'] = $this->batchcard_model->getStockValue();
 		
 		//print_r($data['allhourdata']);die();
 		$this->global['pageTitle'] = 'Siddharth : Final Product';
@@ -1302,7 +1303,8 @@ class batchcard extends BaseController
 		$data['Raw_material'] = $this->batchcard_model->get_rawmaterials();
 		$data['Pack_material'] = $this->batchcard_model->get_packmaterials();
 		$data['supplier'] = $this->batchcard_model->getSupplierlist();
-
+        $data['stock_value'] = $this->batchcard_model->getStockValue();
+      
        
         $this->global['pageTitle'] = 'Siddharth : Final Product';
         $this->loadViews("editFinalProduct", $this->global,$data,NULL);
diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php
index c8a9bfe8..0c585907 100644
--- a/application/views/FinalProduct.php
+++ b/application/views/FinalProduct.php
@@ -1,6 +1,6 @@
- <?php 
-//echo $CId;
- ?>   
+ <!-- <?php 
+echo $CId;
+ ?>   --> 
 
 
     <style type="text/css">
@@ -1261,7 +1261,7 @@ $(function() {
 
 
 <script type="text/javascript">
-  
+//  alert()
 var index=1;
 var rootindex=1;
 var counterindex=1;
@@ -1270,6 +1270,9 @@ var userid  = '';
 var rootuserid = '';
 var counteruserid = '';
 
+var stock = <?php echo json_encode($stock_value, JSON_PRETTY_PRINT) ?>;
+//console.log(stock);
+
 
 
 function addHidden(theForm, key, value) 
@@ -1842,6 +1845,7 @@ $('#EditrawSupplier').change(function()
 var rawresultqty = 0;
 var consuresultant = 0;
 var packresultant = 0;
+var openqty = 0;
 
 
 function ResultantQty(materialtype)
@@ -1855,6 +1859,19 @@ function ResultantQty(materialtype)
       var editmaterialcode = $('#Editrawmaterialcode').val();
       var editsupplier = $('#EditrawSupplier').val();
 
+       $.each(stock,function(j,fnobj)
+       {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+          
+           openqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+      })
+
+      // console.log(openqty);
+
       // alert("add"+materialcode);
       // alert("add"+supplier);
       
@@ -1916,18 +1933,24 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+              if(openqty == null)
+              {
+                openqty=0;
+              }
           });
 
           // console.log(addqty);
           //    console.log(reduceqty)
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
           
           //console.log(resultantqty);
 
           if(isNaN(resultantqty))
           {
-             $('#rawqty').val(0); 
+             // $('#rawqty').val(0); 
+             $('#rawqty').val(openqty); 
              rawresultqty = 0;
           }
           else
@@ -1958,8 +1981,20 @@ function ResultantQty(materialtype)
    {
        var materialcode = $('#consumaterialcode').val();
        var supplier =$('#consuSupplier').val();
+       var conopenqty = 0;
 
-        if(((materialcode != 0)&&(supplier != 0)))
+        $.each(stock,function(j,fnobj)
+        {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+           conopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+        })
+
+      
+      if(((materialcode != 0)&&(supplier != 0)))
       {
 
        // alert("add");
@@ -2015,13 +2050,19 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+              if(conopenqty == null)
+              {
+                conopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
           
           if(isNaN(resultantqty))
           {
-             $('#consuqty').val(0); 
+             // $('#consuqty').val(0); 
+              $('#consuqty').val(conopenqty); 
              consuresultant =0;
 
           }
@@ -2055,6 +2096,17 @@ function ResultantQty(materialtype)
    {
        var materialcode = $('#packumaterialcode').val();
        var supplier =$('#packSupplier').val();
+       var packopenqty = 0;
+
+        $.each(stock,function(j,fnobj)
+       {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+           packopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+       })
 
         if(((materialcode != 0)&&(supplier != 0)))
       {
@@ -2112,13 +2164,19 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+               if(packopenqty == null)
+              {
+                packopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
 
           if(isNaN(resultantqty))
           {
-             $('#packqty').val(0); 
+             // $('#packqty').val(0); 
+              $('#packqty').val(packopenqty); 
              packresultant = 0;
           }
           else
diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php
index 99068645..a76a1ffe 100644
--- a/application/views/editFinalProduct.php
+++ b/application/views/editFinalProduct.php
@@ -1337,6 +1337,9 @@ var userid  = '';
 var conuserid = '';
 var packuserid = '';
 
+var stock = <?php echo json_encode($stock_value, JSON_PRETTY_PRINT) ?>;
+//console.log(stock);
+
 
 
 
@@ -1860,7 +1863,7 @@ $('#EditrawSupplier').change(function()
 var rawresultqty = 0;
 var consuresultant = 0;
 var packresultant = 0;
-
+var openqty = 0;
 
 
 function ResultantQty(materialtype)
@@ -1874,6 +1877,17 @@ function ResultantQty(materialtype)
       var editmaterialcode = $('#Editrawmaterialcode').val();
       var editsupplier = $('#EditrawSupplier').val();
 
+       $.each(stock,function(j,fnobj)
+       {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+          
+           openqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+      })
+
       // alert("add"+materialcode);
       // alert("add"+supplier);
       
@@ -1935,18 +1949,23 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+              if(openqty == null)
+              {
+                openqty=0;
+              }
           });
 
           // console.log(addqty);
           //    console.log(reduceqty)
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
           
           //console.log(resultantqty);
 
           if(isNaN(resultantqty))
           {
-             $('#rawqty').val(0); 
+            // $('#rawqty').val(0); 
+             $('#rawqty').val(openqty); 
              rawresultqty =0;
           }
           else
@@ -1977,6 +1996,18 @@ function ResultantQty(materialtype)
    {
        var materialcode = $('#consumaterialcode').val();
        var supplier =$('#consuSupplier').val();
+       var conopenqty = 0;
+
+
+        $.each(stock,function(j,fnobj)
+        {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+           conopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+        })
 
         if(((materialcode != 0)&&(supplier != 0)))
       {
@@ -2034,13 +2065,19 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+              if(conopenqty == null)
+              {
+                conopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(conopenqty);
        
           if(isNaN(resultantqty))
           {
-             $('#consuqty').val(0); 
+             //$('#consuqty').val(0); 
+                $('#consuqty').val(conopenqty); 
                 consuresultant = 0;
           }
           else
@@ -2073,6 +2110,17 @@ function ResultantQty(materialtype)
    {
        var materialcode = $('#packumaterialcode').val();
        var supplier =$('#packSupplier').val();
+       var packopenqty = 0;
+
+        $.each(stock,function(j,fnobj)
+       {
+        if(materialcode == fnobj.MaterialCode)
+        { 
+           packopenqty = fnobj.stock == '' ? '0' : fnobj.stock;
+           //console.log(openqty);
+        }
+     
+       })
 
         if(((materialcode != 0)&&(supplier != 0)))
       {
@@ -2130,13 +2178,20 @@ function ResultantQty(materialtype)
               {
                 reduceqty=0;
               }
+
+               if(packopenqty == null)
+              {
+                packopenqty=0;
+              }
           });
 
-          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
+          var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(packopenqty);
 
           if(isNaN(resultantqty))
           {
-             $('#packqty').val(0); 
+             //$('#packqty').val(0); 
+
+             $('#packqty').val(packopenqty);
              packresultant =0;
           }
           else
diff --git a/application/views/materialadjustment.php b/application/views/materialadjustment.php
index be3a2416..aa3182c5 100644
--- a/application/views/materialadjustment.php
+++ b/application/views/materialadjustment.php
@@ -284,7 +284,7 @@ $('.getdetails').click(function()
            //console.log(fnobj.MaterialCode);
            //console.log(fnobj.stock);
            openqty = fnobj.stock == '' ? '0' : fnobj.stock;
-           console.log(openqty);
+           //console.log(openqty);
         }
      
    })
@@ -319,10 +319,16 @@ $('.getdetails').click(function()
               {
                 reduceqty=0;
               }
+
+              if(openqty == null)
+              {
+                openqty=0;
+              }
    	   	  });
 
    	   	  var resultantqty = parseFloat(addqty)- parseFloat(reduceqty)+parseFloat(openqty);
-         // console.log(resultantqty);
+          //console.log(resultantqty);
+          //console.log(openqty);
 
    	   	  if(isNaN(resultantqty))
    	   	  {