diff --git a/application/controllers/rawmaterialdetails.php b/application/controllers/rawmaterialdetails.php index be503cf2..c9e06ad2 100755 --- a/application/controllers/rawmaterialdetails.php +++ b/application/controllers/rawmaterialdetails.php @@ -259,6 +259,7 @@ else } $data['materialDetails'] = $this->rawmaterialdetails_model->getMaterialDetails($RawMaterialID); + $data['currentstock'] = $this->rawmaterialdetails_model->getMaterialstock($RawMaterialID); $data['materialType'] = $this->rawmaterialdetails_model->getmaterialType($MaterialType ); $data['materialCategory'] = $this->rawmaterialdetails_model->getmaterialCategory($MaterialCategory); $data['UOMList'] = $this->rawmaterialdetails_model->getUOM($UOM); diff --git a/application/models/rawmaterialdetails_model.php b/application/models/rawmaterialdetails_model.php index 9ee47436..c0fb0aaf 100755 --- a/application/models/rawmaterialdetails_model.php +++ b/application/models/rawmaterialdetails_model.php @@ -119,6 +119,16 @@ class rawmaterialdetails_model extends CI_Model return $query->result(); } + function getMaterialstock($MaterialCode) + { + $subquery="SELECT SUM(IF(Transaction_type='Add',Quantity,0)) - SUM(IF(Transaction_type='Reduce',Quantity,0))as remainingqty +FROM T_Material_stock_history +where MaterialCode='$MaterialCode'"; +$query = $this->db->query($subquery); +return $query->result(); + + } + function getAssetcode() { $this->db->select('AssetCode,AssetName'); diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index ad77162b..ff74ef94 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -182,7 +182,7 @@ $(function() {