diff --git a/application/models/assetdetails_model.php b/application/models/assetdetails_model.php index 5fb55dde..6d0e8b44 100755 --- a/application/models/assetdetails_model.php +++ b/application/models/assetdetails_model.php @@ -60,7 +60,7 @@ class assetdetails_model extends CI_Model $this->db->from('T_PurchaseOrder_Master POM'); $this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO'); $this->db->join('T_SupplierDetailsN sup', 'sup.SupplierID = POM.SupplierID'); - + $this->db->where('POM.status',PO_RELEASED); if(!empty($PO)){ $this->db->where('POM.PONO', $PO); } @@ -69,14 +69,14 @@ class assetdetails_model extends CI_Model return $query->result(); } - function getPO($PO) + function getPO($PO='') { - $this->db->distinct(); + $this->db->distinct(); $this->db->select(' POM.PONO,DeliveryDate,PODate,sup.SupplierName,POM.SupplierID'); $this->db->from('T_PurchaseOrder_Master POM'); - $this->db->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO'); - $this->db->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID'); - + $this->db->join ('T_PurchaseOrder_LineItem POL ',' POL.PONO = POM.PONO'); + $this->db->join ('T_SupplierDetailsN sup ',' sup.SupplierID = POM.SupplierID'); + if(!empty($PO)){ $this->db->where('POM.PONO', $PO); } @@ -86,7 +86,7 @@ class assetdetails_model extends CI_Model } function getlineitemre($line){ - $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID'); + $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POL.Quantity,POM.POType,re.TotalValue,req.ReqNo,emp.firstname,emp.Departmentcode,dep.DepartmentName,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID'); $this->db->from('T_PurchaseOrder_LineItem POL'); $this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left'); $this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left'); @@ -104,7 +104,7 @@ class assetdetails_model extends CI_Model } function getlineitemser($line){ - $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID'); + $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID'); $this->db->from('T_PurchaseOrder_LineItem POL'); $this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left'); $this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left'); @@ -121,7 +121,7 @@ class assetdetails_model extends CI_Model return $result; } function getlineitemimport($line){ - $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,,POM.DeliveryDate,POM.PODate,POM.SupplierID'); + $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,ser.TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID'); $this->db->from('T_PurchaseOrder_LineItem POL'); $this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left'); $this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left'); @@ -139,7 +139,7 @@ class assetdetails_model extends CI_Model } function getlineitemcap($line){ - $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,sum(ser.TotalValue+imp.TotalValue) as TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,POM.DeliveryDate,POM.PODate,POM.SupplierID'); + $this->db->select('POL.LineItemNo,POL.MaterialCode,MM.MaterialName,MM.UOM,POM.POType,POL.Quantity,sum(ser.TotalValue+imp.TotalValue) as TotalValue,req.ReqNo,emp.firstname,dep.DepartmentName,emp.Departmentcode,sup.SupplierName,date(POM.DeliveryDate) as DeliveryDate,POM.PODate,POM.SupplierID'); $this->db->from('T_PurchaseOrder_LineItem POL'); $this->db->join('T_Requestion_Master req','req.ReqNo = POL.ReqNo','left'); $this->db->join('T_PurchaseOrder_Master POM','POM.PONO=POL.PONO','left');