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

ogr

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-12 10:54:28 +05:30
parent 30a0063409
commit 759a9c92b9
6 changed files with 78 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/config/constants.php
View File

@ -127,7 +127,9 @@ define('OGR_COMPLETE', 'ST063');
define('ST044', 'ST044'); define('ST044', 'ST044');
define('PO', 'PO'); define('PO', 'PO');
define('ST063', 'ST063'); define('ST063', 'ST063');
define('OGR_CREATED', 'ST065'); define('OGR_CREATED', 'ST065');
define('OGR_NOT_CREATED', 'ST069');

5
application/controllers/MRIRcontroller.php
View File

@ -327,6 +327,9 @@ public function viewmMaterialDistributionList()
//$check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$strStatus); //$check_OGRPO= $this->inwardgateregister_model->update_OGR($PONO,$strStatus);
} }
$OGRStatus=OGR_NOT_CREATED;
$PoMrirStatus=''; $PoMrirStatus='';
if($ISRejected==1){ if($ISRejected==1){
@ -335,7 +338,7 @@ public function viewmMaterialDistributionList()
else{ else{
$PoMrirStatus = MRIR_REJECTED; $PoMrirStatus = MRIR_REJECTED;
} }
$updatemastervalues = array('MRIRStatus'=>$PoMrirStatus,'UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon); $updatemastervalues = array('MRIRStatus'=>$PoMrirStatus,'UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon,'OGRstatus'=>$OGRStatus);
$updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no); $updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no);

24
application/controllers/inwardgateregister.php
View File

@ -97,9 +97,10 @@ class inwardgateregister extends BaseController
function EditOGR() function EditOGR()
{ {
$OGRNO = $_GET['OGRNO']; $OGRNO = $_GET['OGRNO'];
$MRIRNO = $_GET['MRIRNO'];
$this->global['pageTitle'] = 'Siddharth : View Outward Gate Register'; $this->global['pageTitle'] = 'Siddharth : View Outward Gate Register';
$data['OGR_Data'] = $this->inwardgateregister_model->getOGRDataforedit($OGRNO); $data['OGR_Data'] = $this->inwardgateregister_model->getOGRDataforedit($OGRNO);
$data['OGR_line'] = $this->inwardgateregister_model->getOGRlineDataforedit($OGRNO); $data['OGR_line'] = $this->inwardgateregister_model->getOGRlineDataforedit($OGRNO,$MRIRNO);
$this->loadViews("editogr", $this->global, $data, NULL); $this->loadViews("editogr", $this->global, $data, NULL);
} }
@ -513,8 +514,29 @@ class inwardgateregister extends BaseController
$addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline); $addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);
$this->inwardgateregister_model->UpdateOGRMasterOGRStatus($OGRNO); $this->inwardgateregister_model->UpdateOGRMasterOGRStatus($OGRNO);
$this->inwardgateregister_model->UpdateMRIRMasterOGRStatus($MRIRNO,$OGRNO);
$mrirout= $this->inwardgateregister_model->GetMRIROutQty($MRIRNO,$MaterialCode);
$premrirout=0;
if(!empty($mrirout))
{
foreach($mrirout as $mr)
{
$premrirout= $mr->Ogr_Out_Qty;
}
}
$totmrirout= $premrirout+$Outwardtotal;
$mrirarray=array('Ogr_Out_Qty'=>$totmrirout);
$this->inwardgateregister_model->UpdateMRIROUTQty($mrirarray,$MRIRNO,$MaterialCode);
$POMasterStatus=array('Status'=>PO_RELEASED);
$this->inwardgateregister_model->UpdatePOMasterOGRStatus($pono,$POMasterStatus);
} }

49
application/models/inwardgateregister_model.php
View File

@ -162,6 +162,14 @@ class inwardgateregister_model extends CI_Model
} }
function UpdatePOMasterOGRStatus($pono,$POMasterStatuss)
{
$this->db->where('PONO', $pono);
$this->db->update('T_PurchaseOrder_Master', $POMasterStatuss);
return TRUE;
}
function update_OGR($PONO,$status) function update_OGR($PONO,$status)
{ {
$this->db->select('*'); $this->db->select('*');
@ -206,9 +214,41 @@ class inwardgateregister_model extends CI_Model
if ($query->num_rows == 0) { if ($query->num_rows == 0) {
$this->db->where('OGRNO', $OGRNO); $this->db->where('OGRNO', $OGRNO);
$POStatus = array('status'=>OGR_COMPLETE); $OGRStatus = array('status'=>OGR_PARTIAL_COMPLETE);
$this->db->update('T_OGR_Master', $POStatus); $this->db->update('T_OGR_Master', $OGRStatus);
} }
else
{
$this->db->where('OGRNO', $OGRNO);
$OGRStatus = array('status'=>OGR_COMPLETE);
$this->db->update('T_OGR_Master', $OGRStatus);
}
}
function UpdateMRIRMasterOGRStatus($MRIRNO,$OGRNO)
{
$this->db->select('*');
$this->db->from('T_OGR_Details');
$this->db->where('OGRNO',$OGRNO);
$this->db->where('Status !=',OGR_PARTIAL_COMPLETE);
$query = $this->db->get();
if ($query->num_rows == 0) {
$this->db->where('MRIRNO', $MRIRNO);
$OGRStatus = array('OGRstatus'=>OGR_PARTIAL_COMPLETE);
$this->db->update('T_MRIR_Master', $OGRStatus);
}
else
{
$this->db->where('MRIRNO', $MRIRNO);
$OGRStatus = array('OGRstatus'=>OGR_COMPLETE);
$this->db->update('T_MRIR_Master', $OGRStatus);
}
} }
@ -313,7 +353,7 @@ class inwardgateregister_model extends CI_Model
function getOGRlineDataforedit($OGRNO) function getOGRlineDataforedit($OGRNO,$MRIRNO)
{ {
$this->db->select('T_OGR_Details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected'); $this->db->select('T_OGR_Details.*,MaterialName,ActualQuantityReceived,Quantity,QuantityRejected');
$this->db->from('T_OGR_Details'); $this->db->from('T_OGR_Details');
@ -324,6 +364,7 @@ class inwardgateregister_model extends CI_Model
$this->db->join('T_PurchaseOrder_Master','T_PurchaseOrder_Master.PONO=T_MRIR_Master.PONO'); $this->db->join('T_PurchaseOrder_Master','T_PurchaseOrder_Master.PONO=T_MRIR_Master.PONO');
$this->db->join('T_PurchaseOrder_LineItem','T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO and T_OGR_Details.MaterialCode=T_PurchaseOrder_LineItem.MaterialCode'); $this->db->join('T_PurchaseOrder_LineItem','T_PurchaseOrder_Master.PONO=T_PurchaseOrder_LineItem.PONO and T_OGR_Details.MaterialCode=T_PurchaseOrder_LineItem.MaterialCode');
$this->db->where('T_OGR_Details.OGRNO',$OGRNO); $this->db->where('T_OGR_Details.OGRNO',$OGRNO);
$this->db->where('T_MRIR_Details.MRIRNO',$MRIRNO);
$this->db->group_by('T_OGR_Details.MaterialCode'); $this->db->group_by('T_OGR_Details.MaterialCode');
$query = $this->db->get(); $query = $this->db->get();
@ -354,6 +395,8 @@ class inwardgateregister_model extends CI_Model
$this->db->select('MRIRNO'); $this->db->select('MRIRNO');
$this->db->from('T_MRIR_Master'); $this->db->from('T_MRIR_Master');
$this->db->where('T_MRIR_Master.PONO',$PONO); $this->db->where('T_MRIR_Master.PONO',$PONO);
$this->db->where('T_MRIR_Master.OGRstatus !=',OGR_COMPLETE);
// $this->db->where('Status !=',IGR_CREATED);
$query = $this->db->get(); $query = $this->db->get();
//print_r( $this->db->last_query()); //print_r( $this->db->last_query());
$result = $query->result(); $result = $query->result();

2
application/views/inwardgateregister.php
View File

@ -493,7 +493,7 @@ $('<input>').attr({
}); });
if((status == '<?php echo IGR_CREATED ?>' || status == '<?php echo MRIR_CREATED ?>' || status == '<?php echo MRIR_APPROVED ?>') && ostatus != '<?php echo OGR_CREATED; ?>' ) if((status == '<?php echo IGR_CREATED ?>' || status == '<?php echo MRIR_CREATED ?>' || status == '<?php echo MRIR_APPROVED ?>'))
{ {
alert('The Order is completed!!'); alert('The Order is completed!!');
$("#IGRLink").hide(); $("#IGRLink").hide();

2
application/views/ogrlist.php
View File

@ -61,7 +61,7 @@
<td><?php echo $dt;?></td> <td><?php echo $dt;?></td>
<td><?php echo $ogr->VehicleNo?></td> <td><?php echo $ogr->VehicleNo?></td>
<td><a data-toggle="tooltip" href="<?php echo base_url().'EditOGR?OGRNO='.$ogr->OGRNO ;?>"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $ogr->OGRNO; ?> - Click here to View details"></i></a></td> <td><a data-toggle="tooltip" href="<?php echo base_url().'EditOGR?OGRNO='.$ogr->OGRNO.'&MRIRNO='.$ogr->MRIRNO ;?>"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $ogr->OGRNO; ?> - Click here to View details"></i></a></td>
</tr> </tr>