SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final product

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-09-12 16:10:36 +05:30
parent 4deb612bc8
commit 217034aae9
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/controllers/batchcard.php
View File

@ -1699,7 +1699,7 @@ class batchcard extends BaseController
$copfinal_history = array('RefID'=>$final_product_id,'ProductCode'=>$copmaterial,'Quantity'=>$copqty,'Price'=>$copvalue,'Transactiondate'=>$createddt,'TransactionType'=>'Inward');
$final_cophistory_save= $this->batchcard_model->SaveFinalHistory($copfinal_history);
//$final_cophistory_save= $this->batchcard_model->SaveFinalHistory($copfinal_history);
}
echo "Details Saved Successfully";
@ -2036,16 +2036,16 @@ class batchcard extends BaseController
if(count($checkpackid)>0)
{
$this->batchcard_model->update_finalcoproduct($coparray,$coplineId);
$finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($copfinal_history,$FPID,$copmaterial);
// $this->batchcard_model->update_finalcoproduct($coparray,$coplineId);
// $finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($copfinal_history,$FPID,$copmaterial);
}
else
{
$this->batchcard_model->save_finalcoproduct($coparray);
$final_cophistory_save= $this->batchcard_model->SaveFinalHistory($copfinal_history);
// $this->batchcard_model->save_finalcoproduct($coparray);
// $final_cophistory_save= $this->batchcard_model->SaveFinalHistory($copfinal_history);
}
}
}

8
application/models/batchcard_model.php
View File

@ -864,6 +864,7 @@ and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty';
$this->db->select('T_FinalProduct_Master.*,product_name,product_description');
$this->db->from('T_FinalProduct_Master');
$this->db->join('ip_products','ip_products.product_id=T_FinalProduct_Master.MaterialCode');
$this->db->order_by('T_FinalProduct_Master.FPId','desc');
$res = $this->db->get();
return $res->result();
@ -1174,13 +1175,16 @@ function GetFinishedProductList($starting_date,$end_date,$product_id)
// where ProductCode=?
// and Transactiondate >= ? and Transactiondate <= ?';
$subQuery='select RefID,ProductCode,Quantity,Price,Transactiondate,TransactionType,product_name
$subQuery='select RefID,ProductCode,product_description,Quantity,Price,Transactiondate,TransactionType,product_name
from T_FinalProduct_History
join ip_products on ip_products.product_id= T_FinalProduct_History.ProductCode
where ProductCode=? and Transactiondate >= ? and Transactiondate <= ?';
// $subQuery='select FPId as RefID,product_id as ProductCode,Quantity,product_description,Price,ProductDate as Transactiondate,ProductType as TransactionType,product_name from T_FinalProduct_Master join ip_products on ip_products.product_id= T_FinalProduct_Master.MaterialCode where MaterialCode=? and ProductDate >= ? and ProductDate <= ?';
$query = $this->db->query($subQuery,array($product_id,$starting_date,$end_date));
//print_r($this->db->last_query());
// print_r($this->db->last_query());
return $query->result_array();
}

2
application/views/FinalProductHistory.php
View File

@ -237,7 +237,7 @@ $(function() {
tble +='<tr class="amount">'+
'<td>'+idno+'</td>'+
'<td>'+item.ProductCode+'</td>'+
'<td>'+item.product_name+'</td>'+
'<td>'+item.product_name+'-'+item.product_description+'</td>'+
'<td>'+item.Price+'</td>'+
'<td>'+item.Quantity+'</td>'+
'<td>'+item.TransactionType+'</td>'+