SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock module: invoice product SIA material link

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-12-01 17:07:45 +05:30
parent 7de759a690
commit 6e6dee4013
3 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
application/controllers/batchcard.php
View File

@ -1580,10 +1580,18 @@ class batchcard extends BaseController
$final_history_save= $this->batchcard_model->SaveFinalHistory($final_history); $final_history_save= $this->batchcard_model->SaveFinalHistory($final_history);
$Getmaterial_code = $this->batchcard_model->GetMaterialCode($final_product);
$material_code='';
foreach($Getmaterial_code as $mas)
{
$material_code = $mas->MaterialCode;
}
$finalproducthistory= array('MaterialCode'=>$final_product,'Transaction_type'=>'Add','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'Quantity'=>$final_qty,'ItemValue'=>$product_value,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt); $finalproducthistory= array('MaterialCode'=>$material_code,'Transaction_type'=>'Add','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'Quantity'=>$final_qty,'ItemValue'=>$product_value,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
$this->batchcard_model->save_rawmaterialto_materialHistory($finalproducthistory); $this->batchcard_model->save_rawmaterialto_materialHistory($finalproducthistory);
@ -1733,8 +1741,16 @@ class batchcard extends BaseController
$copfinal_history = array('RefID'=>$final_product_id,'ProductCode'=>$copmaterial,'Quantity'=>$copqty,'Price'=>$copvalue,'Transactiondate'=>$createddt,'TransactionType'=>'Inward'); $copfinal_history = array('RefID'=>$final_product_id,'ProductCode'=>$copmaterial,'Quantity'=>$copqty,'Price'=>$copvalue,'Transactiondate'=>$createddt,'TransactionType'=>'Inward');
$Getmaterial_code = $this->batchcard_model->GetMaterialCode($copmaterial);
$copproducthistory= array('MaterialCode'=>$copmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'Quantity'=>$copqty,'ItemValue'=>$copvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt); $material_code='';
foreach($Getmaterial_code as $mas)
{
$material_code = $mas->MaterialCode;
}
$copproducthistory= array('MaterialCode'=>$material_code,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'Quantity'=>$copqty,'ItemValue'=>$copvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
$this->batchcard_model->save_rawmaterialto_materialHistory($copproducthistory); $this->batchcard_model->save_rawmaterialto_materialHistory($copproducthistory);
@ -1783,10 +1799,20 @@ class batchcard extends BaseController
$finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($final_history,$FPID,$final_product); $finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($final_history,$FPID,$final_product);
$FPhistory= array('MaterialCode'=>$final_product,'Transaction_type'=>'Add','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'Quantity'=>$final_qty,'ItemValue'=>$product_value,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
$Getmaterial_code = $this->batchcard_model->GetMaterialCode($final_product);
$material_code='';
foreach($Getmaterial_code as $mas)
{
$material_code = $mas->MaterialCode;
}
$this->batchcard_model->update_rawmaterialto_materialHistory($FPhistory,$final_product,$FPID); $FPhistory= array('MaterialCode'=>$material_code,'Transaction_type'=>'Add','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'Quantity'=>$final_qty,'ItemValue'=>$product_value,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
$this->batchcard_model->update_rawmaterialto_materialHistory($FPhistory,$material_code,$FPID);
@ -2082,7 +2108,17 @@ class batchcard extends BaseController
$copfinal_history = array('RefID'=>$FPID,'ProductCode'=>$copmaterial,'Quantity'=>$copqty,'Price'=>$copvalue,'Transactiondate'=>$createddt,'TransactionType'=>'Inward'); $copfinal_history = array('RefID'=>$FPID,'ProductCode'=>$copmaterial,'Quantity'=>$copqty,'Price'=>$copvalue,'Transactiondate'=>$createddt,'TransactionType'=>'Inward');
$Cophistory= array('MaterialCode'=>$copmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'Quantity'=>$copqty,'ItemValue'=>$copvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
$Getmaterial_code = $this->batchcard_model->GetMaterialCode($copmaterial);
$material_code='';
foreach($Getmaterial_code as $mas)
{
$material_code = $mas->MaterialCode;
}
$Cophistory= array('MaterialCode'=>$material_code,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'Quantity'=>$copqty,'ItemValue'=>$copvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
@ -2098,7 +2134,7 @@ class batchcard extends BaseController
$finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($copfinal_history,$FPID,$copmaterial); $finalHistoryupdate = $this->batchcard_model->UpdateFinalHistory($copfinal_history,$FPID,$copmaterial);
$this->batchcard_model->update_rawmaterialto_materialHistory($Cophistory,$copmaterial,$FPID); $this->batchcard_model->update_rawmaterialto_materialHistory($Cophistory,$material_code,$FPID);
} }

18
application/models/batchcard_model.php
View File

@ -1564,7 +1564,7 @@ $endyr = $pieces['1'];
$subquery="SELECT $subquery="SELECT
DISTINCT(p.MaterialCode) AS ProductID,Ref_No,Date(CreatedOn) as Cdate,mm.MaterialName,stock,MaterialType,Category,stockdate,p.Transaction_type,Ref_Type, Ref_No,ip.product_name, DISTINCT(p.MaterialCode) AS ProductID,Ref_No,Date(CreatedOn) as Cdate,mm.MaterialName,stock,MaterialType,Category,stockdate,p.Transaction_type,Ref_Type, Ref_No,ip.product_name,invoice_number,
SUM(IF(p.Transaction_type='Add',Quantity,0)) AS Addition, SUM(IF(p.Transaction_type='Add',Quantity,0)) AS Addition,
SUM(IF(p.Transaction_type='Reduce',Quantity,0)) AS Reduce, SUM(IF(p.Transaction_type='Reduce',Quantity,0)) AS Reduce,
SUM((IF(p.Transaction_type='Add',Quantity,0))-(IF(p.Transaction_type='Reduce',Quantity,0))) AS AvailableStock SUM((IF(p.Transaction_type='Add',Quantity,0))-(IF(p.Transaction_type='Reduce',Quantity,0))) AS AvailableStock
@ -1572,6 +1572,7 @@ FROM
T_Material_stock_history AS p T_Material_stock_history AS p
left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode left join T_MaterialMaster mm on mm.MaterialCode = p.MaterialCode
left join ip_products ip on ip.product_id=p.MaterialCode left join ip_products ip on ip.product_id=p.MaterialCode
left join ip_invoices inv on inv.invoice_id=p.Ref_No
where p.MaterialCode='".$search['materialcode']."' where p.MaterialCode='".$search['materialcode']."'
"; ";
@ -1627,6 +1628,21 @@ $query = $this->db->query($subquery,array());
} }
public function GetMaterialCode($itemproductid)
{
$this->db->select('MaterialCode');
$this->db->from('ip_products');
$this->db->where('product_id',$itemproductid);
$query = $this->db->get();
// print_r( $this->db->last_query());
return $query->result();
}
} }
?> ?>

2
application/views/individualStockdetails.php
View File

@ -415,7 +415,7 @@ $(function() {
<?php if($ge->Ref_Type != 'Final Product'){?> <?php if($ge->Ref_Type != 'Final Product'){?>
<td><?php echo $ge->Ref_No?></td> <td><?php echo $ge->invoice_number.'(Invoice Number/Credit Note)'?></td>
<?php } ?> <?php } ?>