From c5446f2e15e3e48e1c5af2f8d3d6ed4dfc7b9179 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Tue, 5 Jun 2018 17:36:20 +0530 Subject: [PATCH] Material history screen added --- application/config/routes.php | 2 + application/controllers/batchcard.php | 10 +++ application/models/batchcard_model.php | 10 +++ application/views/MaterialHistory.php | 105 +++++++++++++++++++++++++ application/views/includes/header.php | 5 ++ 5 files changed, 132 insertions(+) create mode 100644 application/views/MaterialHistory.php diff --git a/application/config/routes.php b/application/config/routes.php index 1dc1a74a..a6b6874b 100755 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -346,5 +346,7 @@ $route['MaterailAdjustmentlist'] = "batchcard/MaterailAdjustmentlist"; $route['EditMaterialAdjustment'] = "batchcard/EditMaterialAdjustment"; +$route['MaterialHistory'] = "batchcard/material_history"; + $route['EditFinalProduct'] = "batchcard/EditFinalProduct"; diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index 4b33e0f2..73253894 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -1793,6 +1793,16 @@ class batchcard extends BaseController //return true; } + function material_history() + { + $this->global['pageTitle'] = 'Siddharth : Material History'; + + $data['material']=$this->batchcard_model->getMaterial_history(); + + $this->loadviews("MaterialHistory",$this->global,$data,NULL); + + + } function UpdateQuantity() { $adjquantity =$this->input->post('adjquantity'); diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index 006c51bf..a8a2600f 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -1052,6 +1052,16 @@ and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty'; $res = $this->db->get(); return $res->result(); } + function getMaterial_history() + { + $sql="SELECT msh.StockId,sd.SupplierName,mm.MaterialName,msh.Transaction_type,msh.Ref_Type,msh.Ref_No,msh.Quantity,msh.ItemValue,msh.CreatedOn FROM T_Material_stock_history as msh + left join T_SupplierDetailsN as sd on sd.SupplierID=msh.SupplierID + left join T_MaterialMaster as mm on mm.MaterialCode=msh.MaterialCode"; + $query =$this->db->query($sql); + return $query->result(); + + + } //created by TamilBala //for update quantity stockhistory function updateQuantityStockHistory($updatequantity,$id) diff --git a/application/views/MaterialHistory.php b/application/views/MaterialHistory.php new file mode 100644 index 00000000..a965881f --- /dev/null +++ b/application/views/MaterialHistory.php @@ -0,0 +1,105 @@ + + +
+ + + +
+
+
+
+
+

Siddharth Industries - Material History

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Stock IDSupplier NameMaterial NameTransaction TypeRef TypeRef NOQuantityItem ValueCreatedON
StockId;?>SupplierName;?>MaterialName;?>Transaction_type;?>Ref_Type;?>Ref_No;?>Quantity;?>ItemValue;?>CreatedOn;?>
+
+ +
+ + +
+ +
+ +
+ +
+ + + + diff --git a/application/views/includes/header.php b/application/views/includes/header.php index d3cc01ac..4ad8c746 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -493,6 +493,11 @@ else{ Material Adjustment List +
  • + + Material History + +