'Newscreenaddedandissuefixed'

This commit is contained in:
gandhimathi Bharathirajan 2017-07-08 02:41:32 +05:30
parent d968350bd9
commit abf0de41aa
2 changed files with 105 additions and 4 deletions

View File

@ -14,7 +14,27 @@ class mrir_model extends CI_Model
return $res->result();
}
/**
* This function is used to get the user listing count
* @param string $searchText : This is optional search text
* @param number $page : This is pagination offset
* @param number $segment : This is pagination limit
* @return array $result : This is result
*/
function ViewigrListing()
{
$this->db->select('igr.*,PO.DeliveryDate,sup.SupplierName');
$this->db->from('T_IGR_Master igr');
$this->db->join('T_PurchaseOrder_Master PO','igr.PONO = PO.PONO');
$this->db->join('T_SupplierDetailsN` sup','PO.SupplierID = sup.SupplierID');
$this->db->where('igr.IGRStatus !=',MRIR_CREATED);
$query = $this->db->get();
$result = $query->result();
return $result;
}
/* This function is used to get the igr value (button link)*/
function get_IGR($IgrNo)
{
@ -56,13 +76,37 @@ class mrir_model extends CI_Model
$query = $this->db->get();
return $query->result();
}
/* This function is used to list the MRIR value*/
function view_mrir_Billing()
{
$this->db->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,TMD.StoreInchargeID,TMD.QualityInchargeID,TMD.PlantInchargeID,TMD.UpdateBY,POM.PODate,POM.POType,POM.ReleasedBy,ED.FirstName as UpdatedbyName,ED1.FirstName as ReleasedbyName,MM.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,IGRD.QuantityAsPerInvoice,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,ST.StatusName,TMD.Remarks');
$this->db->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO=TMD.MRIRNO');
$this->db->join ('T_IGR_Master IGRM','TMM.IGRNO=IGRM.IGRNO');
$this->db->join ('T_IGR_Details IGRD','IGRM.IGRNO=IGRD.IGRNO');
$this->db->join ('T_PurchaseOrder_Master POM','POM.PONO=IGRM.PONO');
$this->db->join ('T_PurchaseOrder_LineItem POL','POL.PONO=POM.PONO');
$this->db->join ('tbl_users user','user.userid=TMD.UpdateBY');
$this->db->join ('T_Employee_Details ED','ED.EmpID = user.EmpID');
$this->db->join ('tbl_users user1','user1.userid = POM.ReleasedBy');
$this->db->join ('T_Employee_Details ED1','ED1.EmpID = user1.EmpID');
$this->db->join ('T_MaterialMaster MM','MM.MaterialCode = IGRD.MaterialCode and POL.MaterialCode = MM.MaterialCode');
$this->db->join ('T_Status ST','ST.StatusCode = TMD.MRIRStatus');
$this->db->where('TMM.MRIRStatus',MRIR_APPROVED);
$this->db->order_by('TMM.MRIRNO','asc');
$query = $this->db->get();
// print_r($this->db->last_query());
return $query->result();
}
/* This function is used to get the MRIR value for edit*/
function edit_mrir($MrirNo)
{
$this->db->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon,TMD.ActualQuantityReceived,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName');
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon,TMD.ActualQuantityReceived,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus');
$this->db->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left');//to get IGRNO,PONO,MRIRNO,mrirdate,
$this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO = TMM.IGRNO','left');//to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,
@ -182,6 +226,33 @@ class mrir_model extends CI_Model
}
}
function UpdateIGRStatus($IGRDetails,$IGRNO)
{
$this->db->where('IGRNO', $IGRNO);
$this->db->update('T_IGR_Master', $IGRDetails);
return TRUE;
}
function getItemQuantityFromStock($MaterialCode)
{
$subQuery = 'select Quantity from T_Store_Stockdetails where MaterialCode=?';
$query = $this->db->query($subQuery,array($MaterialCode));
return $query->result_array();
}
function UpdateStock($StockDetails,$MaterialCode)
{
$this->db->where('MaterialCode', $MaterialCode);
$this->db->update('T_Store_Stockdetails', $StockDetails);
return TRUE;
}
function getMRIRBillingList()
{
}
}
?>

View File

@ -8,16 +8,46 @@ class store_model extends CI_Model
$this->db->select('st.*,MM.*');
$this->db->from('T_Store_Stockdetails st ');
$this->db->join('T_MaterialMaster MM','st.MaterialCode=MM.MaterialCode');
$this->db->join('T_MaterialMaster MM','st.MaterialCode=MM.MaterialCode');
$query = $this->db->get();
//print_r( $this->db->last_query());
$result = $query->result();
return $result;
}
function GetAllMaterialList()
{
$subQuery = 'select MM.* from T_MaterialMaster MM where MaterialCode not in(select MaterialCode from T_Store_Stockdetails)';
$query = $this->db->query($subQuery);
return $query->result();
}
function GetConfigValue($ConfigID)
{
$this->db->select('ConfigValue');
$this->db->from('T_ConfigDetails');
$this->db->where('Config_ID',$ConfigID);
$query = $this->db->get();
$result = $query->result();
return $result;
}
function addStock($StockDetails)
{
$this->db->trans_start();
$this->db->insert('T_Store_Stockdetails', $StockDetails);
$insert_id = $this->db->affected_rows();
$this->db->trans_complete();
}
function UpdateStock($StockDetails,$MaterialCode)
{
$this->db->where('MaterialCode',$MaterialCode);
$this->db->update('T_Store_Stockdetails',$StockDetails);
}
}