add progress

This commit is contained in:
2026-06-03 17:10:49 +07:00
parent dc4e16329f
commit 86d147945b
2 changed files with 322 additions and 333 deletions

View File

@@ -39,14 +39,14 @@ class PurchaseRequestNonPersediaan extends MY_Controller
$params[] = $status;
$params[] = '%' . $search . '%';
$sql = "SELECT M_UserLocationS_RegionalID as S_RegionalID,
$sql = "SELECT
M_UserLocationS_RegionalID as S_RegionalID,
IFNULL(M_BranchCode, '') as M_BranchCode,
IFNULL(M_BranchName, '') as M_BranchName
FROM m_userlocation
LEFT JOIN m_branch ON M_BranchID = M_UserLocationM_BranchID
WHERE
M_UserLocationIsActive = 'Y' AND
M_UserLocationM_UserID = ?";
FROM m_userlocation
LEFT JOIN m_branch ON M_BranchID = M_UserLocationM_BranchID
WHERE M_UserLocationIsActive = 'Y'
AND M_UserLocationM_UserID = ?";
$exec = $this->db->query($sql, [$userId]);
if (!$exec) {
$this->sys_error_db("select user location", $this->db);
@@ -72,14 +72,13 @@ class PurchaseRequestNonPersediaan extends MY_Controller
$totalPage = 1;
$sql = "SELECT COUNT(*) as total
FROM purchase_request
JOIN s_regional ON S_RegionalID = PurchaseRequestS_RegionalID
WHERE
PurchaseRequestIsActive = 'Y' AND
PurchaseRequestItemCategoryID <> '1' AND
( PurchaseRequestDate BETWEEN ? AND ? ) AND
( PurchaseRequestStatus = ? OR ? = '' ) AND
( PurchaseRequestNumber LIKE ?)
FROM purchase_request
JOIN s_regional ON S_RegionalID = PurchaseRequestS_RegionalID
WHERE PurchaseRequestIsActive = 'Y'
AND PurchaseRequestItemCategoryID <> '1'
AND ( PurchaseRequestDate BETWEEN ? AND ? )
AND ( PurchaseRequestStatus = ? OR ? = '' )
AND ( PurchaseRequestNumber LIKE ?)
$filterBranch
$filterRegional";
@@ -96,7 +95,8 @@ class PurchaseRequestNonPersediaan extends MY_Controller
$params[] = $offset;
$params[] = $pageSize;
$sql = "SELECT DISTINCT PurchaseRequestID as prId,
$sql = "SELECT DISTINCT
PurchaseRequestID as prId,
PurchaseRequestNumber as prNumber,
PurchaseRequestDate as prDate,
PurchaseRequestStatus as prStatus,
@@ -119,41 +119,37 @@ class PurchaseRequestNonPersediaan extends MY_Controller
ah.AssetHandoverID AS handoverID,
ah.AssetHandoverDate AS handoverDate,
ah.AssetHandoverToUserID AS handoverToUserID
FROM purchase_request
JOIN s_regional ON S_RegionalID = PurchaseRequestS_RegionalID
JOIN item_category ON item_category.ItemCategoryID = PurchaseRequestItemCategoryID
JOIN m_user requestedBy ON requestedBy.M_UserID = PurchaseRequestRequestedBy
LEFT JOIN m_user approvedBy ON approvedBy.M_UserID = PurchaseRequestApprovedBy
LEFT JOIN m_branch ON M_BranchCode = PurchaseRequestM_BranchCode
LEFT JOIN asset_handover ah
ON ah.AssetHandoverPurchaseRequestID = PurchaseRequestID
FROM purchase_request
JOIN s_regional ON S_RegionalID = PurchaseRequestS_RegionalID
JOIN item_category ON item_category.ItemCategoryID = PurchaseRequestItemCategoryID
JOIN m_user requestedBy ON requestedBy.M_UserID = PurchaseRequestRequestedBy
LEFT JOIN m_user approvedBy ON approvedBy.M_UserID = PurchaseRequestApprovedBy
LEFT JOIN m_branch ON M_BranchCode = PurchaseRequestM_BranchCode
LEFT JOIN asset_handover ah ON ah.AssetHandoverPurchaseRequestID = PurchaseRequestID
AND ah.AssetHandoverIsActive = 'Y'
WHERE
PurchaseRequestIsActive = 'Y' AND
PurchaseRequestItemCategoryID <> '1' AND
( PurchaseRequestDate BETWEEN ? AND ? ) AND
( PurchaseRequestStatus = ? OR ? = '' ) AND
( PurchaseRequestNumber LIKE ? )
WHERE PurchaseRequestIsActive = 'Y'
AND PurchaseRequestItemCategoryID <> '1'
AND ( PurchaseRequestDate BETWEEN ? AND ? )
AND ( PurchaseRequestStatus = ? OR ? = '' )
AND ( PurchaseRequestNumber LIKE ? )
$filterBranch
$filterRegional
ORDER BY PurchaseRequestID DESC
LIMIT ?, ?";
ORDER BY PurchaseRequestID DESC
LIMIT ?, ?";
$exec = $this->db->query($sql, $params);
if (!$exec) {
$this->sys_error_db("select purchase request", $this->db);
exit;
}
//echo $this->db->last_query();
//exit;
$rows = $exec->result_array();
$query = $this->db->last_query();
$result = array(
"total" => $totalPage,
"totalFilter" => $totalCount,
"records" => $rows
"records" => $rows,
"db" => $query
);
$this->sys_ok($result);