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

ForgotPassword, Draft for other status issue fixed in PDF

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-08-17 11:19:13 +05:30
parent 51f88c7ea1
commit 6192e211cd
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/models/mrir_model.php
View File

@ -71,8 +71,8 @@ function ViewDistributionList()
MM.MaterialCode = POL.MaterialCode join
T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join T_Status st on
st.StatusCode = ReqLine.Status join T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where
POL.status=? and ReqLine.Status not in(?) group by POL.MaterialCode ,POL.PONO';
$query = $this->db->query($subQuery,array(MRIR_APPROVED,REQITEM_NEW));
POL.status in (?,?) and ReqLine.Status not in(?) group by POL.MaterialCode ,POL.PONO';
$query = $this->db->query($subQuery,array(MRIR_APPROVED,PARTIAL_MRIRAPPROVED,REQITEM_NEW));
//print_r($this->db->last_query());
return $query->result();
}
@ -304,10 +304,20 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
}
function UpdatePOLineItem($LineItem,$PONO,$MaterialCode)
{
$subQuery = 'select * from T_PurchaseOrder_LineItem where Quantity = ReceivedQuantity and PONO=?';
$query = $this->db->query($subQuery,array($PONO));
$subQuery = 'select * from T_PurchaseOrder_LineItem where Quantity = ReceivedQuantity and PONO=? and MaterialCode=? ';
$query = $this->db->query($subQuery,array($PONO,$MaterialCode));
if($query->num_rows > 0)
$ApprovedCount = $query->num_rows;
$subQuery = 'select * from T_PurchaseOrder_LineItem where Quantity > ReceivedQuantity and ReceivedQuantity != 0 and PONO=? and MaterialCode=?';
$query = $this->db->query($subQuery,array($PONO,$MaterialCode));
$PartialApproved = $query->num_rows;
echo 'Partialcount'.$PartialApproved;
if($ApprovedCount > 0)
{
$this->db->where('PONO', $PONO);
$this->db->where('MaterialCode', $MaterialCode);
@ -315,6 +325,19 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount ');
return TRUE;
}
elseif($PartialApproved > 0)
{
$updateby=$this->session->userdata('userId');
$date = new DateTime('now',new DateTimeZone('Asia/Kolkata'));
$updateon = $date->format('Y-m-d H:i:s');
$POLineItem = array('Status'=>PARTIAL_MRIRAPPROVED,'UpdateBY'=>$updateby,'UpdatedOn'=>$updateon );
$this->db->where('PONO', $PONO);
$this->db->where('MaterialCode', $MaterialCode);
$this->db->update('T_PurchaseOrder_LineItem', $POLineItem);
return TRUE;
}
}
function UpdatePOMaster($PONO,$PoMrirStatus,$updatedBy)