diff --git a/application/config/routes.php b/application/config/routes.php index 3afe3dcd..7effb624 100755 --- a/application/config/routes.php +++ b/application/config/routes.php @@ -339,6 +339,8 @@ $route['poresetview']="purchaseorder/poresetview"; $route['FinalProduct'] = "batchcard/FinalProductCalculation"; +$route['FinalProductHistory'] = "batchcard/FinalProductHistory"; + $route['FinalProductlisting'] = "batchcard/FinalProductlisting"; $route['MaterailAdjustment'] = "batchcard/MaterailAdjustment"; diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php index 73253894..928a834e 100755 --- a/application/controllers/batchcard.php +++ b/application/controllers/batchcard.php @@ -1321,6 +1321,16 @@ class batchcard extends BaseController } + + function FinalProductHistory() + { + + $data['inv_final_product'] = $this->batchcard_model->getinvoice_products(); + $this->global['pageTitle'] = 'Siddharth : Final Product'; + $this->loadViews("FinalProductHistory", $this->global,$data,NULL); + } + + function MaterailAdjustment() { $data['MaterialCode'] = $this->batchcard_model->getMaterial(); @@ -1358,6 +1368,23 @@ class batchcard extends BaseController + function getFinishedProduct() + { + $starting_date = $this->input->post('from_date'); + $end_date = $this->input->post('to_date'); + $product_id = $this->input->post('productid'); + + $productlist = $this->batchcard_model->GetFinishedProductList($starting_date,$end_date,$product_id); + + $obj=json_encode($productlist); + echo $obj; + + //print_r($productlist); + } + + + + // function displaying_stockvalues() // { // $MaterialCode = $this->input->post('MaterialCode'); @@ -1459,7 +1486,7 @@ class batchcard extends BaseController $product_value = $this->input->post('values'); $createdby = $this->session->userdata('userId'); - $final_master =array('MaterialCode'=>$final_product,'Quantity'=>$final_qty,'Price'=>$product_value,'CreatedBy'=>$createdby,'ProductDate'=>$pdt); + $final_master =array('MaterialCode'=>$final_product,'Quantity'=>$final_qty,'Price'=>$product_value,'CreatedBy'=>$createdby,'ProductDate'=>$pdt,'ProductType'=>'Inward'); $final_master_save =$this->batchcard_model->insert_final_product($final_master); diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index ca66f729..cfde19d2 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -1108,6 +1108,29 @@ and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty'; $r = $this->db->affected_rows(); return $r; } + + + + function GetFinishedProductList($starting_date,$end_date,$product_id) + { + + + $subQuery ='select ip_products.product_id,ip_products.product_name,ip_invoices.invoice_id,ip_invoice_items.item_quantity,ip_invoice_items.item_price,ip_invoices.invoice_number as IDnumber,ip_invoices.receivedstatus as Type from ip_products join ip_invoice_items on ip_products.product_id = ip_invoice_items.item_product_id join ip_invoices on ip_invoice_items.invoice_id = ip_invoices.invoice_id +join T_FinalProduct_Master on ip_products.product_id = T_FinalProduct_Master.MaterialCode where (ip_invoices.invoice_date_modified>=? and ip_invoices.invoice_date_modified<=? and ip_invoice_items.item_product_id=?) union + +select ip_products.product_id,ip_products.product_name,T_FinalProduct_Master.FPId,T_FinalProduct_Master.Quantity,T_FinalProduct_Master.Price,T_FinalProduct_Master.FPId as IDnumber,T_FinalProduct_Master.ProductType as Type from ip_products join ip_invoice_items on ip_products.product_id = ip_invoice_items.item_product_id +join T_FinalProduct_Master on ip_products.product_id = T_FinalProduct_Master.MaterialCode where +(T_FinalProduct_Master.ProductDate<=? and T_FinalProduct_Master.ProductDate>=? and T_FinalProduct_Master.MaterialCode=?) group by FPId'; + + $query = $this->db->query($subQuery,array($starting_date,$end_date,$product_id,$end_date,$starting_date,$product_id)); + + //print_r($this->db->last_query()); + + + return $query->result_array(); + + + } } diff --git a/application/views/FinalProductHistory.php b/application/views/FinalProductHistory.php new file mode 100644 index 00000000..3b4443ae --- /dev/null +++ b/application/views/FinalProductHistory.php @@ -0,0 +1,256 @@ + + + + + + + + + +
+
+
+ +
+
+

Siddharth Industries - Final Product History

+
+ +
+ + +
+ +
+ +
+ + 'form-label-left final_product ','name' => 'final_product','id' => 'final_product'); + + echo form_open($this->config->base_url().'/batchcard/Final+Product/',$attributes); + ?> + +
+
+ + + + 'Select Material'); + + if(!empty($inv_final_product)) + { + foreach ($inv_final_product as $SID): + + + $options2[$SID->product_id] = $SID->product_id.' '.' - '.' '.$SID->product_name; + + endforeach; + } + + echo form_dropdown('DEPTFN', $options2,set_value('DEPTFN',$SupId),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2'); + + ?> + + +
+ +
+ +
+ 'fromDate','value' => set_value('fromDate',$CurrentDate),'id'=>'fromDate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+ +
+ + +
+ +
+ 'toDate','value' => set_value('toDate',$CurrentDate),'id'=>'toDate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); + echo form_input($data); + ?> +
+ +
+ + + + + + + + + + +
+ +
+ +
+ + + + +   Go +
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + +
Invoice ID/Final Product IDProduct CodeProduct NamePriceQuantityType
+ + + +
+
+ + \ No newline at end of file diff --git a/application/views/includes/header.php b/application/views/includes/header.php index acd747e1..c54aabbb 100755 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -402,7 +402,7 @@ display: none;
  • - Store Details + Stock Details @@ -412,17 +412,27 @@ display: none; -
  • +
  • Final Product
    • + + +
  • + + Finished Product History + +
    • + + +
  • Final Product Listing @@ -463,11 +473,11 @@ else{