diff --git a/application/controllers/resinbatchcard.php b/application/controllers/resinbatchcard.php index 02109e0c..5d7bf187 100644 --- a/application/controllers/resinbatchcard.php +++ b/application/controllers/resinbatchcard.php @@ -206,7 +206,7 @@ class resinbatchcard extends BaseController $batchdate = $this->input->post('param3'); $batchdate = date_format(date_create($batchdate),'Y-m-d'); $plantname = $this->input->post('param4'); - $macinecode = $this->input->post('param5'); + $machines = $this->input->post('param5'); $trpbatchcard = $this->input->post('param6'); $igrnos = $this->input->post('param7'); $igrlinenos = $this->input->post('param8'); @@ -230,6 +230,7 @@ class resinbatchcard extends BaseController $Catalystigrno = $this->input->post('param22'); $bagsigrnos = $this->input->post('param23'); $tonigrnos= $this->input->post('param24'); + $resinname=$this->input->post('param25'); $opstoinsert = json_decode($opstoinsert); $opstodelete = json_decode($opstodelete); @@ -279,7 +280,7 @@ class resinbatchcard extends BaseController } } - $masterreportdata = array('remarks'=>$remarks,'updatedby'=>$createby,'approvedby'=>$approvedby,'document'=>$document,'sandtotal'=>$sandtotal,'resintotal'=>$resintotal,'hextotal'=>$hextotal,'cstotal'=>$cstotal,'catalysttotal'=>$catalysttotal,'bags50total'=>$bags50total,'ton1bagstotal'=>$ton1bagstotal,'producitonloss'=>$producitonloss,'finishedproduct'=>$finishedproduct,'operatedby'=>$operatedby, + $masterreportdata = array('batchdate'=>$batchdate,'plantname'=>$plantname,'machinecode'=>$machines,'trpbatchcardno'=>$trpbatchcardno,'igrno'=>$igrnos,'igrlineno'=>$igrlinenos,'resinname'=>$resinname,'remarks'=>$remarks,'updatedby'=>$createby,'approvedby'=>$approvedby,'document'=>$document,'sandtotal'=>$sandtotal,'resintotal'=>$resintotal,'hextotal'=>$hextotal,'cstotal'=>$cstotal,'catalysttotal'=>$catalysttotal,'bags50total'=>$bags50total,'ton1bagstotal'=>$ton1bagstotal,'producitonloss'=>$producitonloss,'finishedproduct'=>$finishedproduct,'operatedby'=>$operatedby, 'igrno_for_sand'=>$sandigrnos, 'igrno_for_resin'=>$Resinigrnos, 'igrno_for_haxamine'=>$Hexamineigrnos, @@ -321,16 +322,16 @@ class resinbatchcard extends BaseController } - if(!empty($opstodelete)){ + if(!empty($opstodelete)){ + foreach($opstodelete as $key => $opstdel) { - + //echo 'FROM CON'.'-'.$MASTERID.'-'.$opstdel[0]; $this->db->where('master_id',$MASTERID); - $this->db->where('EmpID',$opstdel[$key]); + $this->db->where('EmpID',$opstdel[0]); $this->db->delete('T_ResinBatchCard_Operators'); //print_r($tArray); } - } echo "Report Data Saved Successfully!"; diff --git a/application/models/quality_model.php b/application/models/quality_model.php index 9c00fff1..9d31f00e 100755 --- a/application/models/quality_model.php +++ b/application/models/quality_model.php @@ -263,12 +263,13 @@ class Quality_model extends CI_Model function getResinBatchCardDetails($rbcid) { - $sql = 'select T_ResinBatchCard_Master.*,ip_products.product_name,ip_products.product_description,ip_clients.client_name,T_Machine_Master.Machine_Name,T_Employee_Details.FirstName,T_Employee_Details.LastName from T_ResinBatchCard_Master + $sql = 'select T_ResinBatchCard_Master.*,ip_products.product_name,ip_products.product_description,ip_clients.client_name,T_Machine_Master.Machine_Name,T_Employee_Details.EmpID,T_Employee_Details.FirstName,T_Employee_Details.LastName,a.FirstName as name from T_ResinBatchCard_Master join ip_products on T_ResinBatchCard_Master.productid = ip_products.product_id join ip_clients on T_ResinBatchCard_Master.customerid = ip_clients.client_id join T_Machine_Master on T_ResinBatchCard_Master.machinecode = T_Machine_Master.Machine_Code join tbl_users on T_ResinBatchCard_Master.createdby = tbl_users.userId join T_Employee_Details on tbl_users.EmpID = T_Employee_Details.EmpID + join T_Employee_Details as a on a.EmpID = T_ResinBatchCard_Master.operatedby where T_ResinBatchCard_Master.resinbatch_id = ?'; $res['masterdata'] = $this->db->query($sql,array($rbcid))->result(); //print_r($res['masterdata']); diff --git a/application/views/editresinbatchcard.php b/application/views/editresinbatchcard.php index 03f7fcd9..2f3677c3 100644 --- a/application/views/editresinbatchcard.php +++ b/application/views/editresinbatchcard.php @@ -1030,8 +1030,8 @@ console.log(listopsforstore+'-'+oldops); var customerid = $('#customer').val(); var batchdate = $('#batchdate').val(); var plantname = $('#plantname').val(); - var macinecode = $('#machines').val(); - var trpbatchcard = $('#trpbatchnos').val(); + var machines = $('#machines').val(); + var trpbatchcardno = $('#trpbatchnos').val(); var igrnos = $('#igrnos').val(); var igrlinenos = $('#igrlinenos').val(); var remarks = $('#remarks').val(); @@ -1051,6 +1051,7 @@ console.log(listopsforstore+'-'+oldops); var bagsigrlinenos = $('#bagsigrlinenos').val(); var tonigrnos = $('#tonigrnos').val(); var tonigrlinenos = $('#tonigrlinenos').val(); + var resinname =$('#resinname').val(); if(approvedby == -1 || listopsforstore.length == 0 || operatedby == -1) { @@ -1085,8 +1086,8 @@ console.log(listopsforstore+'-'+oldops); var param2 = customerid; var param3 = batchdate; var param4 = plantname; - var param5 = macinecode; - var param6 = trpbatchcard; + var param5 = machines; + var param6 = trpbatchcardno; var param7 = igrnos; var param8 = igrlinenos; var param9 = remarks; @@ -1105,6 +1106,7 @@ console.log(listopsforstore+'-'+oldops); var param22 = Catalystigrnos+'-'+Catalystigrlinenos; var param23 = bagsigrnos+'-'+bagsigrlinenos; var param24 = tonigrnos+'-'+tonigrlinenos; + var param25 = resinname; @@ -1132,6 +1134,7 @@ console.log(listopsforstore+'-'+oldops); formData.append('param22',param22); formData.append('param23',param23); formData.append('param24',param24); + formData.append('param25',param25); diff --git a/application/views/viewresinbatchpdf.php b/application/views/viewresinbatchpdf.php index bec520ba..7c0b02ec 100644 --- a/application/views/viewresinbatchpdf.php +++ b/application/views/viewresinbatchpdf.php @@ -36,59 +36,57 @@ th{
-
+ + + - + -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -   - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ?> - - - - - - - - - @@ -96,10 +94,9 @@ th{ - - - -

RESIN BATCH CARD REPORT

RESIN BATCH CARD REPORT

B No : trpbatchcardno;?>Date:batchdate),'d-m-Y');?>Shift:plantname?>SAND: igrno;?>RESIN:resinname?>
Operatorclient_name?>product_name.'-'.$records['masterdata'][0]->product_description?>
Resin Name : resinname;?> Batch Date : batchdate),'d-m-Y');?>
Shift Name : plantname?>TRP Batch No(For TRP Sand) : trpbatchcardno;?>
IGR No(For Resin)igrno_for_resin;?> IGR No(For Hexamine)igrno_for_haxamine;?>
IGR No(For CS)igrno_for_cs;?>IGR No(For Catalyst)igrno_for_catalyst;?>
IGR No(For 50 Bags)igrno_for_bags;?>IGR No(For 1 ton Bag)igrno_for_tonbags;?>
IGR No(For Fresh Sand)igrno_for_sand;?>Machine Namemachinecode .'-'.$records['masterdata'][0]->Machine_Name?>
Helpers EmpID.">".$ex->EmpID.'-'.$ex->FirstName.'-'.$ex->LastName.""; + echo "Customer:client_name?>Grade:product_name.'-'.$records['masterdata'][0]->product_description?>Machine Name:machinecode;?>
+ + +
@@ -278,8 +275,8 @@ th{

- + @@ -1075,5 +1072,4 @@ console.log(listopsforstore+'-'+oldops); - - \ No newline at end of file +
INSPECTOR NAME - :session->userdata ( 'name' );?>                                                      APPROVED BY:approvedby; ?>
Operator + :operatedby.'-'.$records['masterdata'][0]->name?>                                                      Production In charge :approvedby; ?>