diff --git a/application/config/constants.php b/application/config/constants.php
index 744f41ee..bd5fd9de 100755
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -336,5 +336,7 @@ define('Capital_RMCIncludingCustomers_Charge1',
define('Consumables', 'Consumables');
define('RawMaterial', 'Raw Material');
define('Packingmaterial', 'Packing material');
+define('FinalProduct', 'Final Product');
+
/* End of file constants.php */
/* Location: ./application/config/constants.php */
diff --git a/application/config/routes.php b/application/config/routes.php
index a4dfb98f..1dc1a74a 100755
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -334,12 +334,17 @@ $route['DeliveryPerformance']="user/deliver_perform";
$route['poresetview']="purchaseorder/poresetview";
-//stock
+//stock
$route['FinalProduct'] = "batchcard/FinalProductCalculation";
+$route['FinalProductlisting'] = "batchcard/FinalProductlisting";
+
$route['MaterailAdjustment'] = "batchcard/MaterailAdjustment";
$route['MaterailAdjustmentlist'] = "batchcard/MaterailAdjustmentlist";
$route['EditMaterialAdjustment'] = "batchcard/EditMaterialAdjustment";
+
+$route['EditFinalProduct'] = "batchcard/EditFinalProduct";
+
diff --git a/application/controllers/batchcard.php b/application/controllers/batchcard.php
index fc429845..abecdede 100755
--- a/application/controllers/batchcard.php
+++ b/application/controllers/batchcard.php
@@ -1272,6 +1272,39 @@ class batchcard extends BaseController
}
+ function EditFinalProduct()
+ {
+
+ $FPId = $_GET['FPId'];
+ $data['masterproduct'] = $this->batchcard_model->getmasterProductDetails($FPId);
+ $data['rawmaterial'] = $this->batchcard_model->getrawmaterialDetails($FPId);
+ $data['consumaterial'] = $this->batchcard_model->getconsumaterialDetails($FPId);
+ $data['packagematerial'] = $this->batchcard_model->getpackagematerialDetails($FPId);
+ $data['coproductmaterial'] = $this->batchcard_model->getcoproductmaterial($FPId);
+ $data['inv_final_product'] = $this->batchcard_model->getinvoice_products();
+ $data['consumable_material']= $this->batchcard_model->get_consumablematerials();
+ $data['Raw_material'] = $this->batchcard_model->get_rawmaterials();
+ $data['Pack_material'] = $this->batchcard_model->get_packmaterials();
+ $data['supplier'] = $this->batchcard_model->getSupplierlist();
+
+
+ $this->global['pageTitle'] = 'Siddharth : Final Product';
+ $this->loadViews("editFinalProduct", $this->global,$data,NULL);
+ // $this->loadViews("finaledit", $this->global,$data,NULL);
+
+
+ }
+
+
+ function FinalProductlisting()
+ {
+ $data['final_product'] = $this->batchcard_model->getFinalProductDetaisl();
+
+ $this->global['pageTitle'] = 'Siddharth : Final Product';
+ $this->loadViews("FinalProductlisting", $this->global,$data,NULL);
+ }
+
+
function MaterailAdjustment()
{
$data['MaterialCode'] = $this->batchcard_model->getMaterial();
@@ -1408,6 +1441,11 @@ class batchcard extends BaseController
$rawarray =array('FPId'=>$final_product_id,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+ $rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+
+ $this->batchcard_model->save_rawmaterialto_materialHistory($rawmaterialhistory);
+
//print_r($rawarray);
$this->batchcard_model->save_finalraw($rawarray);
@@ -1423,6 +1461,10 @@ class batchcard extends BaseController
$conarray =array('FPId'=>$final_product_id,'MaterialCode'=>$conmaterial,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'Price'=>$convalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+ $consuhistory= array('MaterialCode'=>$conmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'ItemValue'=>$convalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+ $this->batchcard_model->save_rawmaterialto_materialHistory($consuhistory);
+
$this->batchcard_model->save_finalcon($conarray);
}
@@ -1436,6 +1478,10 @@ class batchcard extends BaseController
$packarray =array('FPId'=>$final_product_id,'MaterialCode'=>$packmaterial,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'Price'=>$packvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+ $packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+ $this->batchcard_model->save_rawmaterialto_materialHistory($packmathistory);
+
$this->batchcard_model->save_finalpacking($packarray);
}
@@ -1459,6 +1505,234 @@ class batchcard extends BaseController
+ }
+
+
+
+
+ function UpdateFinal_Product_Save()
+ {
+
+
+ $FPID = $this->input->post('FPId');
+ $final_product = $this->input->post('DEPTFN');
+ $final_qty = $this->input->post('Quantity');
+
+ $product_date = $this->input->post('Date');
+ //$pdt = $product_date->format('Y-m-d H:i:s');
+ //$pdt = date("Y-m-d", strtotime($product_date));
+
+ $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'=>$product_date);
+
+ // / print_r($final_master);
+
+ $final_master_save =$this->batchcard_model->update_final_product($final_master,$FPID);
+ $lastId='';
+
+
+
+ $rawilne = $this->input->post('RawRow');
+ $consuline = $this->input->post('ConsuRow');
+ $packline = $this->input->post('PkgRow');
+ $coproline = $this->input->post('CopRow');
+
+
+ for($i=1;$i<=$rawilne;$i++)
+ {
+ $rawmaterial = $this->input->post('rawmaterialcode'.$i);
+ $rawsupplier =$this->input->post('rawSupplierID'.$i);
+ $rawqty = $this->input->post('rawQty'.$i);
+ $rawvalue = $this->input->post('rawprice'.$i);
+ $rawilneno = $this->input->post('RawId'.$i);
+ //echo $rawilneno;
+ if($rawmaterial == '' && $rawsupplier == '' & $rawqty == '')
+ {
+
+ }
+
+ else
+ {
+
+ $rawarray =array('FPId'=>$FPID,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+
+
+
+
+ $rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+
+ $checkrawid=$this->batchcard_model->GetRawid($rawilneno);
+
+ $checkrawhistory = $this->batchcard_model->GetRawCheck($rawmaterial,$FPID);
+
+ // echo $checkrawhistory;
+
+
+ if(count($checkrawid)==0)
+ {
+ $this->batchcard_model->save_finalraw($rawarray);
+ $this->batchcard_model->save_rawmaterialto_materialHistory($rawmaterialhistory);
+
+ }
+
+ else
+ {
+ $this->batchcard_model->update_finalraw($rawarray,$rawilneno);
+ $this->batchcard_model->update_rawmaterialto_materialHistory($rawmaterialhistory,$rawmaterial,$FPID);
+ //$this->batchcard_model->save_rawmaterialto_materialHistory($rawmaterialhistory);
+ }
+
+ }
+ }
+
+
+
+
+ for($i=1;$i<=$consuline;$i++)
+ {
+ $conmaterial = $this->input->post('consumematerialcode'.$i);
+ $consupplier =$this->input->post('consumeSupplierID'.$i);
+ $conqty = $this->input->post('consumeQty'.$i);
+ $convalue = $this->input->post('consumeprice'.$i);
+ $consuline = $this->input->post('Consumable'.$i);
+
+ if($conmaterial == '' && $consupplier == '' & $conqty == '')
+ {
+
+ }
+
+ else
+ {
+
+ $conarray =array('FPId'=>$FPID,'MaterialCode'=>$conmaterial,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'Price'=>$convalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+
+ $consuhistory= array('MaterialCode'=>$conmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'ItemValue'=>$convalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+
+ $checkconsuid=$this->batchcard_model->Getconsuid($consuline);
+
+ if(count($checkconsuid)>0)
+ {
+ $this->batchcard_model->update_finalconsu($conarray,$consuline);
+ $this->batchcard_model->update_rawmaterialto_materialHistory($consuhistory,$conmaterial,$FPID);
+ }
+
+ else
+ {
+ $this->batchcard_model->save_finalcon($conarray);
+ $this->batchcard_model->save_rawmaterialto_materialHistory($consuhistory);
+ }
+
+
+ }
+ }
+
+
+
+
+ for($i=1;$i<=$packline;$i++)
+ {
+ $packmaterial = $this->input->post('packmaterialcode'.$i);
+ $packsupplier =$this->input->post('packSupplierID'.$i);
+ $packqty = $this->input->post('packQty'.$i);
+ $packvalue = $this->input->post('packprice'.$i);
+ $packlineId = $this->input->post('packId'.$i);
+
+ if($packmaterial == '' && $packsupplier == '' & $packqty == '')
+ {
+
+ }
+
+ else{
+
+ $packarray =array('FPId'=>$FPID,'MaterialCode'=>$packmaterial,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'Price'=>$packvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+
+ //print_r($packarray);
+ $packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
+
+ $checkpackid=$this->batchcard_model->Getpackid($packlineId);
+
+ if(count($checkpackid)>0)
+ {
+ $this->batchcard_model->update_finalpacking($packarray,$packlineId);
+
+ $this->batchcard_model->update_rawmaterialto_materialHistory($packmathistory,$packmaterial,$FPID);
+ }
+
+ else
+ {
+
+ $this->batchcard_model->save_rawmaterialto_materialHistory($packmathistory);
+
+ $this->batchcard_model->save_finalpacking($packarray);
+ }
+ }
+ //echo "Updated";
+
+ }
+
+
+
+
+ for($i=1;$i<=$coproline;$i++)
+ {
+
+ $copmaterial = $this->input->post('Copmaterialcode'.$i);
+ $codate =$this->input->post('CopDate'.$i);
+ $copqty = $this->input->post('CopQty'.$i);
+ $copvalue = $this->input->post('Copprice'.$i);
+ $coplineId = $this->input->post('CopId'.$i);
+
+ if($copmaterial == '' && $codate == '' & $copqty == '')
+ {
+
+ }
+ else
+ {
+
+ $coparray =array('FPId'=>$FPID,'MaterialCode'=>$copmaterial,'CoDate'=>$codate,'Quantity'=>$copqty,'Price'=>$copvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
+
+ $checkpackid=$this->batchcard_model->Getcopid($coplineId);
+ // print_r($coparray);
+
+ if(count($checkpackid)>0)
+ {
+ $this->batchcard_model->update_finalcoproduct($coparray,$coplineId);
+ }
+ else
+ {
+
+ $this->batchcard_model->save_finalcoproduct($coparray);
+ }
+ }
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ echo "Updated";
+
+
+
+
+
}
diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php
index 296cac0e..4aadbd31 100755
--- a/application/models/batchcard_model.php
+++ b/application/models/batchcard_model.php
@@ -769,6 +769,208 @@ and CreatedOn >= ? and CreatedOn<=? and SupplierID=? group by Addqty';
$res = $this->db->get();
return $res->result();
}
+
+
+ function save_rawmaterialto_materialHistory($materialhistory)
+ {
+ $this->db->trans_start();
+ $this->db->insert('T_Material_stock_history',$materialhistory);
+ $insert_id = $this->db->affected_rows();
+ $this->db->trans_complete();
+ return true;
+ }
+
+
+ function getFinalProductDetaisl()
+ {
+ $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');
+ $res = $this->db->get();
+ return $res->result();
+
+ }
+
+
+ function getmasterProductDetails($FPId)
+ {
+ $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->where('T_FinalProduct_Master.FPId',$FPId);
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+
+ function getrawmaterialDetails($FPId)
+ {
+ $this->db->select('T_FinalProduct_RawMaterials.*,SupplierName,MaterialName');
+ $this->db->from('T_FinalProduct_RawMaterials');
+ $this->db->join('T_MaterialMaster','T_MaterialMaster.MaterialCode=T_FinalProduct_RawMaterials.MaterialCode');
+ $this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=T_FinalProduct_RawMaterials.SupplierID');
+ $this->db->where('T_FinalProduct_RawMaterials.FPId',$FPId);
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+
+ function getconsumaterialDetails($FPId)
+ {
+ $this->db->select('T_FinalProduct_ConsumableMaterials.*,SupplierName,MaterialName');
+ $this->db->from('T_FinalProduct_ConsumableMaterials');
+ $this->db->join('T_MaterialMaster','T_MaterialMaster.MaterialCode=T_FinalProduct_ConsumableMaterials.MaterialCode');
+ $this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=T_FinalProduct_ConsumableMaterials.SupplierID');
+ $this->db->where('T_FinalProduct_ConsumableMaterials.FPId',$FPId);
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+
+ function getpackagematerialDetails($FPId)
+ {
+ $this->db->select('T_FinalProduct_PackingMaterials.*,SupplierName,MaterialName');
+ $this->db->from('T_FinalProduct_PackingMaterials');
+ $this->db->join('T_MaterialMaster','T_MaterialMaster.MaterialCode=T_FinalProduct_PackingMaterials.MaterialCode');
+ $this->db->join('T_SupplierDetailsN','T_SupplierDetailsN.SupplierID=T_FinalProduct_PackingMaterials.SupplierID');
+ $this->db->where('T_FinalProduct_PackingMaterials.FPId',$FPId);
+ $res = $this->db->get();
+ return $res->result();
+ }
+
+
+ function getcoproductmaterial($FPId)
+ {
+ $subQuery ='select T_FinalProduct_CoProduct_Materials.*,product_name
+ from T_FinalProduct_CoProduct_Materials
+ join ip_products on ip_products.product_id = T_FinalProduct_CoProduct_Materials.MaterialCode
+ where T_FinalProduct_CoProduct_Materials.FPId=?';
+
+ $query = $this->db->query($subQuery,array($FPId));
+
+ return $query->result_array();
+
+ }
+
+
+ function update_final_product($final_master,$FPId)
+ {
+ //print_r($final_master);
+ $this->db->where('FPId', $FPId);
+ $this->db->update('T_FinalProduct_Master', $final_master);
+ $insert_id = $this->db->affected_rows();
+ //return TRUE;
+ if($insert_id>0)
+ {
+ $subQuery = 'select max(FPId) as FPId from T_FinalProduct_Master';
+
+ $query = $this->db->query($subQuery,array());
+
+ return $query->result_array();
+ }
+ }
+
+
+
+ function GetRawid($rawilneno)
+ {
+ $this->db->select('*');
+ $this->db->from('T_FinalProduct_RawMaterials');
+ $this->db->where('RawId',$rawilneno);
+ $query = $this->db->get();
+ //print_r($this->db->last_query());
+ return $query->result();
+ }
+
+
+
+ function Getconsuid($consuline)
+ {
+ $this->db->select('*');
+ $this->db->from('T_FinalProduct_ConsumableMaterials');
+ $this->db->where('ConId',$consuline);
+ $query = $this->db->get();
+ //print_r($this->db->last_query());
+ return $query->result();
+ }
+
+
+ function Getpackid($packlineId)
+ {
+
+ $this->db->select('*');
+ $this->db->from('T_FinalProduct_PackingMaterials');
+ $this->db->where('PackId',$packlineId);
+ $query = $this->db->get();
+ //print_r($this->db->last_query());
+ return $query->result();
+ }
+
+
+ function Getcopid($coplineId)
+ {
+ $this->db->select('*');
+ $this->db->from('T_FinalProduct_CoProduct_Materials');
+ $this->db->where('CoId',$coplineId);
+ $query = $this->db->get();
+ //print_r($this->db->last_query());
+ return $query->result();
+
+ }
+
+
+ function update_finalraw($rawarray,$rawilneno)
+ {
+ $this->db->where('RawId', $rawilneno);
+ $this->db->update('T_FinalProduct_RawMaterials', $rawarray);
+ return TRUE;
+ }
+
+
+ function GetRawCheck($rawmaterial,$final_product_id)
+ {
+ $this->db->select('*');
+ $this->db->from('T_Material_stock_history');
+ $this->db->where('MaterialCode',$rawmaterial);
+ $this->db->where('Ref_No',$final_product_id);
+ $this->db->where('Ref_Type',FinalProduct);
+ $query = $this->db->get();
+ //print_r($this->db->last_query());
+ return $query->result();
+ }
+
+
+ function update_rawmaterialto_materialHistory($rawmaterialhistory,$rawmaterial,$FPID)
+ {
+ $this->db->where('Ref_No', $FPID);
+ $this->db->where('MaterialCode', $rawmaterial);
+ $this->db->update('T_Material_stock_history', $rawmaterialhistory);
+ return TRUE;
+ }
+
+
+ function update_finalconsu($conarray,$consuline)
+ {
+ $this->db->where('ConId', $consuline);
+ $this->db->update('T_FinalProduct_ConsumableMaterials', $conarray);
+ return TRUE;
+ }
+
+
+ function update_finalpacking($conarray,$packlineId)
+ {
+ $this->db->where('PackId', $packlineId);
+ $this->db->update('T_FinalProduct_PackingMaterials', $conarray);
+ return TRUE;
+ }
+
+
+ function update_finalcoproduct($coparray,$coplineId)
+ {
+ $this->db->where('CoId', $coplineId);
+ $this->db->update('T_FinalProduct_CoProduct_Materials', $coparray);
+ return TRUE;
+ }
}
diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php
index 740cd1d6..b75d4c36 100644
--- a/application/views/FinalProduct.php
+++ b/application/views/FinalProduct.php
@@ -1291,6 +1291,8 @@ $("#EditItem").on("shown.bs.modal", function(e)
userid = $(e.relatedTarget).data('userid');
var tr= document.getElementById(userid);
+
+
$('#Editrawmaterialcode').val($('#rawmaterialcode'+userid).val());
$('#EditrawSupplier').val($('#rawSupplierID'+userid).val());
$('#Editrawqty').val($('#rawQty'+userid).val());
@@ -1372,19 +1374,24 @@ $("#EditRootCausemodal").on("shown.bs.modal", function(e)
$('.rootEditItem').click(function()
{
+
+ //alert()
var editconsumaterialcode= $('#Editconsumaterialcode').val();
var editconsuSupplierID = $('#EditconsuSupplier').val();
var editconsuQty = $('#Editconsuqty').val();
var editrawprice = $('#Editconsuprice').val();
- var tr= document.getElementById(rootuserid);
- var cellval = tr.cells;
- cellval[1].innerHTML = editconsumaterialcode;
- cellval[2].innerHTML = editconsuSupplierID;
- cellval[3].innerHTML = editconsuQty;
- cellval[4].innerHTML = editrawprice;
+ // var tr= document.getElementById(rootuserid);
+ // var cellval = tr.cells;
+ // cellval[1].innerHTML = editconsumaterialcode;
+ // cellval[2].innerHTML = editconsuSupplierID;
+ // cellval[3].innerHTML = editconsuQty;
+ // cellval[4].innerHTML = editrawprice;
- // document.getElementById('rootcause'+rootuserid).innerHTML = editroot;
+ document.getElementById('consumaterial'+rootuserid).innerHTML = editconsumaterialcode;
+ document.getElementById('consusuppliername'+rootuserid).innerHTML = editconsuSupplierID;
+ document.getElementById('consuQuantiy'+rootuserid).innerHTML = editconsuQty;
+ document.getElementById('consumaterialPrice'+rootuserid).innerHTML = editrawprice;
$('#consumematerialcode'+rootuserid).val(editconsumaterialcode);
$('#consumeSupplierID'+rootuserid).val(editconsuSupplierID);
@@ -1451,13 +1458,21 @@ $('.CounterEditItem').click(function()
var editpacksuppliername = EditpackSupplier.options[EditpackSupplier.selectedIndex].text;
var tr= document.getElementById(cuserid);
- var cellval = tr.cells;
+ //var cellval = tr.cells;
//alert(cuserid)
- cellval[1].innerHTML = editpackmaterialcode;
- cellval[2].innerHTML = editpacksuppliername;
- cellval[3].innerHTML = editpackQty;
- cellval[4].innerHTML = editpackprice;
+ // cellval[1].innerHTML = editpackmaterialcode;
+ // cellval[2].innerHTML = editpacksuppliername;
+ // cellval[3].innerHTML = editpackQty;
+ // cellval[4].innerHTML = editpackprice;
+
+
+ document.getElementById('packmaterial'+cuserid).innerHTML = editpackmaterialcode;
+ document.getElementById('packsuppliername'+cuserid).innerHTML = editpackSupplierID;
+ document.getElementById('packQuantiy'+cuserid).innerHTML = editpackQty;
+ document.getElementById('packmaterialPrice'+cuserid).innerHTML = editpackprice;
+
+
$('#packmaterialcode'+cuserid).val(editpackmaterialcode);
$('#packSupplierID'+cuserid).val(editpackSupplierID);
@@ -1529,13 +1544,18 @@ $('.CoEditItem').click(function()
var editcopproduct = Editcoproduct_id.options[Editcoproduct_id.selectedIndex].text;
var tr= document.getElementById(cuserid);
- var cellval = tr.cells;
+ //var cellval = tr.cells;
//alert(cuserid)
- cellval[1].innerHTML = editcopproduct;
- cellval[2].innerHTML = editcopdate;
- cellval[3].innerHTML = editcopqty;
- cellval[4].innerHTML = editcopprice;
+ // cellval[1].innerHTML = editcopproduct;
+ // cellval[2].innerHTML = editcopdate;
+ // cellval[3].innerHTML = editcopqty;
+ // cellval[4].innerHTML = editcopprice;
+
+ document.getElementById('Copmaterial'+cuserid).innerHTML = editcoproductid;
+ document.getElementById('Copsuppliername'+cuserid).innerHTML = newdate;
+ document.getElementById('CopQuantiy'+cuserid).innerHTML = editcopqty;
+ document.getElementById('CopmaterialPrice'+cuserid).innerHTML = editcopprice;
$('#Copmaterialcode'+cuserid).val(editcoproductid);
$('#CopDate'+cuserid).val(newdate);
@@ -2221,7 +2241,7 @@ function Save()
alert(data);
$('#content').loader('hide');
- //window.location = "ncrlist";
+ window.location = "FinalProductlisting";
}
else
diff --git a/application/views/FinalProductlisting.php b/application/views/FinalProductlisting.php
new file mode 100644
index 00000000..5850cc59
--- /dev/null
+++ b/application/views/FinalProductlisting.php
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | # |
+ Id |
+ Product Name |
+ Quantity |
+ Price |
+ Date |
+ Action |
+
+
+
+
+ |
+ FPId ?> |
+ product_description."-".$record->product_name; ?> | Quantity; ?> |
+ Price ?> |
+ ProductDate);
+ $CreatedDate= $Cdt->format('d-m-Y');
+ echo $CreatedDate; ?> |
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php
new file mode 100644
index 00000000..dbc38c44
--- /dev/null
+++ b/application/views/editFinalProduct.php
@@ -0,0 +1,2341 @@
+ ProductDate;
+ $Ddt = new DateTime($ma->ProductDate);
+ $date = $Ddt->format('d-m-Y');
+ $qty = $ma->Quantity;
+ $value = $ma->Price;
+ $finProduct = $ma->MaterialCode;
+ $FPId = $ma->FPId;
+ }
+}
+
+
+//echo $finProduct;
+
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'form-label-left final_product ','name' => 'final_product','id' => 'final_product');
+
+ echo form_open($this->config->base_url().'/batchcard/FinalProduct/',$attributes);
+ ?>
+
+
+
+
+
+
+ product_id)
+ {
+ $options1[$material->product_id] = $material->product_id.' '.' - '.' '.$material->product_name;
+ }
+ }
+
+
+ // foreach ($inv_final_product as $materiall)
+ // {
+ // if($finProduct != $material->product_id)
+ // {
+
+ // $options1[$materiall->product_id] = $materiall->product_id.' '.' - '.' '.$materiall->product_name;
+
+ // }
+ // }
+
+
+ }
+
+ echo form_dropdown('DEPTFN', $options1,set_value('DEPTFN',$product_id),'id="DEPTFN"' ,'required="true"' ,'class="form-control select2');
+
+ ?>
+
+
+
+
+
+ 'Date','value' => set_value('Date',$date),'id'=>'Date', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+ 'Quantity','value' => set_value('Quantity',$qty),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'values','value' => set_value('values',$value),'id'=>'values', 'class' => 'form-control' ,'required' => 'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Raw Materials
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Material Code');
+
+ if(!empty($Raw_material))
+ {
+ foreach ($Raw_material as $mat):
+ $options[$mat->MaterialCode] =$mat->MaterialCode.' '.' - '.' '.$mat->MaterialName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('rawmaterialcode', $options,set_value('MaterialCode'),'id="rawmaterialcode"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+ 'Select Supplier');
+
+ if(!empty($supplier))
+ {
+ foreach ($supplier as $mat):
+ $options[$mat->SupplierID] =$mat->SupplierID.' '.' - '.' '.$mat->SupplierName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('rawSupplier', $options,set_value('SupplierID'),'id="rawSupplier"' ,'class="form-control select2"' ,'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'rawqty','value' => set_value('rawqty'),'id'=>'rawqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'rawprice','value' => set_value('rawprice'),'id'=>'rawprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Editrawmaterialcode','value' => set_value('Editrawmaterialcode'),'id'=>'Editrawmaterialcode', 'class' => 'form-control' , 'readonly'=>'true');
+ echo form_input($data);
+
+
+
+ ?>
+
+
+
+
+
+
+
+
+
+ 'EditrawSupplier','value' => set_value('EditrawSupplier'),'id'=>'EditrawSupplier', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+
+
+
+ // echo form_dropdown('EditrawSupplier', $options,set_value('SupplierID'),'id="EditrawSupplier"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'Editrawqty','value' => set_value('Editrawqty'),'id'=>'Editrawqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Editrawprice','value' => set_value('Editrawprice'),'id'=>'Editrawprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | S.No |
+
+ Material Code |
+
+ Supplier |
+ Quantity |
+ Price |
+ Action |
+
+
+
+
+ |
+ MaterialCode?> |
+
+ SupplierID."-".$raw->SupplierName?> |
+ Quantity;?> |
+ Price?> |
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Add Consumable Materials
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Material Code');
+
+ if(!empty($consumable_material))
+ {
+ foreach ($consumable_material as $mat):
+ $options[$mat->MaterialCode] =$mat->MaterialCode.' '.' - '.' '.$mat->MaterialName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('consumaterialcode', $options,set_value('MaterialCode'),'id="consumaterialcode"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+ 'Select Supplier');
+
+ if(!empty($supplier))
+ {
+ foreach ($supplier as $mat):
+ $options[$mat->SupplierID] =$mat->SupplierID.' '.' - '.' '.$mat->SupplierName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('consuSupplier', $options,set_value('SupplierID'),'id="consuSupplier"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'consuqty','value' => set_value('consuqty'),'id'=>'consuqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'consuprice','value' => set_value('consuprice'),'id'=>'consuprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Editconsumaterialcode','value' => set_value('Editconsumaterialcode'),'id'=>'Editconsumaterialcode', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'EditconsuSupplier','value' => set_value('EditconsuSupplier'),'id'=>'EditconsuSupplier', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'Editconsuqty','value' => set_value('Editconsuqty'),'id'=>'Editconsuqty', 'class' => 'form-control',);
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Editconsuprice','value' => set_value('Editconsuprice'),'id'=>'Editconsuprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | S.No |
+ Material Code |
+
+ Supplier |
+ Quantity |
+ Price |
+ Action |
+
+
+
+
+ |
+ MaterialCode?> |
+
+ SupplierID."-".$cou->SupplierName?> |
+ Quantity?> |
+ Price?> |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Add Packing Materials
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Material Code');
+
+ if(!empty($Pack_material))
+ {
+ foreach ($Pack_material as $mat):
+ $options[$mat->MaterialCode] =$mat->MaterialCode.' '.' - '.' '.$mat->MaterialName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('packumaterialcode', $options,set_value('MaterialCode'),'id="packumaterialcode"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+ 'Select Material Code');
+
+ if(!empty($supplier))
+ {
+ foreach ($supplier as $mat):
+ $options[$mat->SupplierID] =$mat->SupplierID.' '.' - '.' '.$mat->SupplierName;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('packSupplier', $options,set_value('SupplierID'),'id="packSupplier"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'packqty','value' => set_value('packqty'),'id'=>'packqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'packprice','value' => set_value('packprice'),'id'=>'packprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Editpackumaterialcode','value' => set_value('Editpackumaterialcode'),'id'=>'Editpackumaterialcode', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+ 'EditpackSupplier','value' => set_value('EditpackSupplier'),'id'=>'EditpackSupplier', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+ 'Editpackqty','value' => set_value('Editpackqty'),'id'=>'Editpackqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Editpackprice','value' => set_value('Editpackprice'),'id'=>'Editpackprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | S.No |
+ Material Code |
+
+ Supplier |
+ Quantity |
+ Price |
+ Action |
+
+
+
+
+ |
+ MaterialCode?> |
+
+ SupplierID."-".$pac->SupplierName?> |
+ Quantity?> |
+ Price?> |
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Add Co-Products
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Select Material Code');
+
+ if(!empty($inv_final_product))
+ {
+ foreach ($inv_final_product as $mat):
+ $options[$mat->product_id] =$mat->product_id.' '.' - '.' '.$mat->product_name;
+
+
+ //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName;
+ endforeach;
+ }
+
+
+
+
+ echo form_dropdown('coproduct_id', $options,set_value('product_id'),'id="coproduct_id"' ,'class="form-control select2"' , 'required="true"' );
+ ?>
+
+
+
+
+
+
+
+
+ 'CopDate','value' => set_value('CopDate',$CurrentDate),'id'=>'CopDate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Coqty','value' => set_value('Coqty'),'id'=>'Coqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'Coprice','value' => set_value('Coprice'),'id'=>'Coprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 'Editcoproduct_id','value' => set_value('Editcoproduct_id'),'id'=>'Editcoproduct_id', 'class' => 'form-control','readonly'=>'true');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'EditCopDate','value' => set_value('EditCopDate',$CurrentDate),'id'=>'EditCopDate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+ 'EditCoqty','value' => set_value('EditCoqty'),'id'=>'EditCoqty', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+ 'EditCoprice','value' => set_value('EditCoprice'),'id'=>'EditCoprice', 'class' => 'form-control');
+ echo form_input($data);
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | S.No |
+ Product Id |
+
+ Date |
+ Quantity |
+ Price |
+ Action |
+
+
+
+
+
+ |
+ |
+
+ |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/application/views/includes/header.php b/application/views/includes/header.php
index 6729b5e5..eba89211 100755
--- a/application/views/includes/header.php
+++ b/application/views/includes/header.php
@@ -406,6 +406,12 @@ display: none;
+
+
+ Final Product Listing
+
+
+
@@ -435,6 +441,12 @@ else{
Final Product
+
+
+
+ Final Product Listing
+
+