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

Emergency po changes done and also all data requistion changed from requistion level done

Browse Source
This commit is contained in:
gandhimathi 2017-11-02 16:25:15 +05:30
parent b9830ed729
commit d0b16714ce
5 changed files with 73 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
application/controllers/emergencypurchaseorder.php
View File

@ -92,7 +92,7 @@ class emergencypurchaseorder extends BaseController
}
//This used to Create Service Purchase Order
function addNewServicePurchaseOrder()
function addNewServicePurchaseOrder()
{
@ -148,13 +148,8 @@ class emergencypurchaseorder extends BaseController
$ServiceTypeOptions=$this->input->post('PoTypeOptions');
$DescriptionOfPo = $this->input->post('emergdescofpo');
$RequestedBy=$this->purchaseorder_model->getDepartmentEmpList($RequestedBy);
foreach($RequestedBy[0] as $key => $value){
$RequestedBy=$value;
}
//create T_Requestion_Master
$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$RequistionComments,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$RequestedBy,'Schedule_Type'=>$ServiceScheduleType,'NumberOfService'=>$ServiceServiceNo,'Service_Period'=>$ServiceScheduleOptions);
$Request = array('ReqType'=>$POType, 'RequestedDept'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$RequistionComments,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'Schedule_Type'=>$ServiceScheduleType,'NumberOfService'=>$ServiceServiceNo,'Service_Period'=>$ServiceScheduleOptions);
$Req = $this->requistion_model->addRequistion($Request);
@ -329,12 +324,9 @@ $RequestedBy = $this->input->post('drpDepartment');
$PaymentTerms=$this->input->post('PaymentMethod');
$OtherPayment=$this->input->post('Otherpayment');
$RequestedBy=$this->purchaseorder_model->getDepartmentEmpList($RequestedBy);
foreach($RequestedBy[0] as $key => $value){
$RequestedBy=$value;
}
//add requistion
$Request = array('ReqType'=>$POType, 'Requestedby'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$RequistionComments,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
$Request = array('ReqType'=>$POType, 'RequestedDept'=>$RequestedBy,'CostCenterCode'=>$CostCenterName,'Status'=>$ReqStatus,'Comments'=>$RequistionComments,'ReqDate'=>$createddt,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy);
$Req = $this->requistion_model->addRequistion($Request);

4
application/controllers/purchaseorder.php
View File

@ -158,6 +158,7 @@ class purchaseorder extends BaseController
/* Cost code from Requisition - Client Review Fix
Start here */
$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
$data['RequistionDetails'] = $ReqDetails;
$CostCode = '';
@ -232,6 +233,8 @@ class purchaseorder extends BaseController
}
else if($ReqType == SERVICE)
{
$ViewName = 'servicePurchaseorder';
}
else if($ReqType == IMPORT)
@ -339,6 +342,7 @@ class purchaseorder extends BaseController
$ReqDetails = $this->purchaseorder_model->getRequistDetails($ReqArray);
$data['RequistionDetails'] = $ReqDetails;
foreach ($data['RequistionDetails'] as $ReqDet)
{

7
application/controllers/requisitionform.php
View File

@ -331,7 +331,7 @@ class requisitionform extends BaseController
/**
* This function is used to add new Cost to the system
*/
function addNewRequistion()
function addNewRequistion()
{
$this->form_validation->set_rules('RequestType','RequestType','trim|required');
@ -346,6 +346,7 @@ class requisitionform extends BaseController
$Status= $_GET['ID'];
$RequestType = strtoupper(trim($this->input->post('RequestType')));
$Requestedby = strtoupper(trim($this->input->post('EmpID')));
$RequestedbyDept = $this->session->userdata ( 'DEPCode' );
$CostCenter = $this->input->post('CostCenter');
$CreateBy = $this->session->userdata ( 'userId' );
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
@ -366,7 +367,7 @@ class requisitionform extends BaseController
if(count( $IsExists) == 0)
{
//echo 'Not Exists';
$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod,'RequestedDept'=>$RequestedbyDept);
//print_r($Request);
@ -375,7 +376,7 @@ class requisitionform extends BaseController
else
{
//echo 'Exists';
$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod);
$Request = array('ReqType'=>$RequestType, 'Requestedby'=>$Requestedby,'ReqDate'=>$createddt,'Status'=>$Status,'CreatedDate'=>$createddt,'CreatedBy'=>$CreateBy,'CostCenterCode'=>$CostCenter,'Schedule_Type'=>$serviceSchedule,'NumberOfService'=>$noOfService,'Service_Period'=>$servicePeriod,'RequestedDept'=>$RequestedbyDept);
$UpdateReq = $this->requistion_model->UpdateRequistion($Request,$IsExists[0]['ReqNo']);
}
$ReqNumber = '';

78
application/models/purchaseorder_model.php
View File

@ -7,12 +7,15 @@ class purchaseorder_model extends CI_Model
$this->db->distinct();
$this->db->select('PO.PONO');
$this->db->from('T_PurchaseOrder_Master PO');
$this->db->Join('T_PurchaseOrder_LineItem Line','PO.PONO = Line.PONO');
$this->db->Join('T_Requestion_Master Req','Req.ReqNo = Line.ReqNo');
$this->db->Join('T_Employee_Details Emp','Emp.EmpID= Req.Requestedby');
$this->db->join('T_PurchaseOrder_LineItem Line','PO.PONO = Line.PONO');
$this->db->join('T_Requestion_Master Req','Req.ReqNo = Line.ReqNo');
$this->db->where('PO.POType',SERVICE);
$this->db->where('PO.status',PO_RELEASED);
$this->db->where('Emp.Departmentcode',$this->session->userdata('DEPCode'));
$this->db->where('Req.RequestedDept',$this->session->userdata('DEPCode'));
$query = $this->db->get();
return $query->result();
@ -53,8 +56,8 @@ class purchaseorder_model extends CI_Model
join T_Status Stat on Stat.StatusCode = POMast.Status
join T_Requestion_Master mast on mast.ReqNo = LineItem.ReqNo
join tbl_users users on users.userId = POMast.CreatedBy
join T_Employee_Details emp on emp.EmpID = mast.Requestedby
join T_DepartmentDetails Dept on Dept.DEPCode = emp.Departmentcode
left join T_Employee_Details emp on emp.EmpID = mast.Requestedby
join T_DepartmentDetails Dept on Dept.DEPCode = mast.RequestedDept
join T_CostCenter_Master Cost on Cost.CostCenterCode=LineItem.CostCenterCode
where POMast.POType=? and ServiceWorkStatus=? order by POMast.UpdatedOn desc';
@ -300,15 +303,33 @@ function GetPOType($ReqNo)
*/
function getRequistDetails($ReqNoList='')
{
$this->db->distinct();
$ReqDeatis = $this->GetRequistionMasterUsingReqNo($ReqNoList);
foreach ($ReqDeatis as $SID):
$ReqBy = $SID->Requestedby ;
endforeach;
if($ReqBy=='' || $ReqBy==null){
$this->db->distinct();
$this->db->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,mast.Schedule_Type,mast.NumberOfService,mast.Service_Period,'-' as FirstName, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status');
$this->db->from('T_Requestion_Master mast');
$this->db->join('T_DepartmentDetails Dept', 'mast.RequestedDept = Dept.DEPCode');
$this->db->where_in('mast.ReqNo', $ReqNoList);
}
else if($ReqBy!='') {
$this->db->distinct();
$this->db->select('ReqNo,ReqType,Status,Requestedby,mast.CreatedDate,mast.Schedule_Type,mast.NumberOfService,mast.Service_Period,emp.FirstName,emp.EmpID,emp.Designation, Dept.DEPCode,Dept.DepartmentName,mast.ReqDate,mast.CostCenterCode,mast.Status');
$this->db->from('T_Requestion_Master mast');
$this->db->join('T_Employee_Details emp', 'mast.Requestedby = emp.EmpID');
$this->db->join('T_DepartmentDetails Dept', 'emp.Departmentcode = Dept.DEPCode');
$this->db->where_in('mast.ReqNo', $ReqNoList);
$this->db->join('T_DepartmentDetails Dept', 'mast.RequestedDept = Dept.DEPCode');
$this->db->where_in('mast.ReqNo', $ReqNoList);
}
$query = $this->db->get();
//print_r($this->db->last_query());
return $query->result();
}
/**
@ -667,8 +688,8 @@ function GetPOType($ReqNo)
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode
where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
@ -716,8 +737,8 @@ function GetPOType($ReqNo)
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Revenue_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode
where LineItem.PONO =?';
$query = $this->db->query($subQuery,array($PONO));
@ -917,13 +938,13 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
join T_Employee_Details emp on Req.Requestedby = emp.EmpID
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
left join T_MRIR_Master Mast on POMast.PONO=Mast.PONO
left join T_MRIR_Details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
//print_r($subQuery);
$query = $this->db->query($subQuery,array($PONO));
@ -1353,9 +1374,9 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Import_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join T_Requestion_Master Req on Req.ReqNo = LineItem.ReqNo
join T_Employee_Details emp on Req.Requestedby = emp.EmpID
left join T_Employee_Details emp on Req.Requestedby = emp.EmpID
join T_DepartmentDetails Dept on emp.Departmentcode = Dept.DEPCode where LineItem.PONO =?';
join T_DepartmentDetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
//print_r($subQuery);
$query = $this->db->query($subQuery,array($PONO));
@ -1445,15 +1466,15 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
}
else{
$ReqNo = $res->ReqNo;
$this->db->select('ReqMast.ReqNo,ReqMast.CostCenterCode,ReqMast.ReqDate,ReqMast.Schedule_Type,ReqMast.NumberOfService,ReqMast.Service_Period,re.FirstName,Dept.DEPCode,Dept.DepartmentName,Dept.shortName');
$this->db->select('ReqMast.ReqNo,ReqMast.CostCenterCode,ReqMast.ReqDate,ReqMast.Schedule_Type,ReqMast.NumberOfService,ReqMast.Service_Period,Dept.DEPCode,Dept.DepartmentName,Dept.shortName');
$this->db->from('T_Requestion_Master ReqMast');
$this->db->join('T_Employee_Details re','re.EmpID=ReqMast.Requestedby');
$this->db->join('T_DepartmentDetails Dept', 're.Departmentcode = Dept.DEPCode');
$this->db->join('T_DepartmentDetails Dept', 'ReqMast.RequestedDept = Dept.DEPCode');
$this->db->where('ReqMast.ReqNo',$ReqNo);
$Reqresult=$this->db->get();
$Details['RequistionNo']= $Reqresult->result()[0]->ReqNo;
$Detaisl['ReqDate']=$Reqresult->result()[0]->ReqDate;
$Details['RequestedName']= $Reqresult->result()[0]->FirstName;
$Details['RequestedDept']= $Reqresult->result()[0]->shortName;
$Details['CostCenterCode']= $Reqresult->result()[0]->CostCenterCode;
$date = new DateTime($Reqresult->result()[0]->ReqDate,new DateTimeZone('Asia/Kolkata'));
@ -1669,5 +1690,18 @@ function getDepartmentEmpList($DepCode=''){
$query = $this->db->get();
return $query->result();
}
//get req master details using reqno
function GetRequistionMasterUsingReqNo($Req){
$this->db->select('Requestedby');
$this->db->from('T_Requestion_Master');
$this->db->where('ReqNo', $Req[0]);
$query = $this->db->get();
return $query->result();
}
}

9
application/views/editCapitalPo.php
View File

@ -2,7 +2,9 @@
$insuranceStatus = array(
array("name"=>"NO","value"=>"0"),array("name"=>"YES","value"=>"1")
);
$requestedBy=$requestedBy[0]->FirstName;
$requestedBy=$RequistionDetails[0]->FirstName;
$Updateddt = new DateTime($RequistionDetails[0]->ReqDate);
$UpdatedOn=$Updateddt->format('d-m-Y');
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$CurrentDate = $dt->format('d-m-Y');
$res_arr_values = array();
@ -69,7 +71,7 @@
$PayableAT='';
$ExchangeDate='';
$ExchangeRateOn='';
$UpdatedOn;
$CapitalRange='';
$PoStatusName='';
$otherPayment='';
@ -140,8 +142,7 @@ if(!empty($POMaster))
$PaymentTerms=$Req->PaymentTerms;
$otherPayment = $Req->PaymentOtherDescription;
$Updateddt = new DateTime($Req->UpdatedOn);
$UpdatedOn=$Updateddt->format('d-m-Y');
$CapitalRange=$Req->CapitalRange;
$Import_DispatchDetails=$Req->Import_DispatchDetails;