From 6445075a19e091de4d4c7b9b7b52a4deb2c7db44 Mon Sep 17 00:00:00 2001 From: Cheng Date: Thu, 15 Feb 2024 08:51:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8D=8E=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms/bonus/bonus.php | 83 ++++---- .../other/maintenance_contract_bonus_v2_1.php | 6 +- .../contract-renovate-input.php | 198 +++++++++--------- 3 files changed, 144 insertions(+), 143 deletions(-) diff --git a/wms/bonus/bonus.php b/wms/bonus/bonus.php index 186a1598..eb1959a2 100644 --- a/wms/bonus/bonus.php +++ b/wms/bonus/bonus.php @@ -26,7 +26,7 @@ if (!empty($_GET['check'])) { } } -$sql = "SELECT * FROM bonus WHERE 1=1 $clause "; +$sql = "SELECT * FROM bonus WHERE 1=1 $clause LIMIT 50"; $stmt = $conn->prepare($sql); $stmt->execute(); $datas = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -41,22 +41,22 @@ function isPay($contract_no, $connT8) { // echo $contract_no; $sql = "SELECT - a.BillNo, - b.OTaxAmt as amount, - a.CU_EstPayDate as createDate, - b.PersonId as personId, - c.BillNo as CBno, - c.CU_MaterialId as facility -FROM salIncomeApplyDetail as a -LEFT JOIN salIncomeApplyMaster as b ON a.BillNo = b.BillNo -LEFT JOIN ( - SELECT aMaster.BillNo,aMaster.BizPartnerId,aDetail.CU_MaterialId FROM arCheckBill as aMaster - LEFT JOIN arCheckBillDetail as aDetail ON aMaster.BizPartnerId = aDetail.FromBillNo - WHERE aMaster.BizPartnerId = 'Q23080067' AND aMaster.TypeId = 'RVS' - ) AS c ON a.BillNo = c.BizPartnerId -WHERE a.BillNo = '$contract_no' -AND a.RowNo = '1' -"; + a.BillNo, + b.OTaxAmt as amount, + a.CU_EstPayDate as createDate, + b.PersonId as personId, + c.BillNo as CBno, + c.CU_MaterialId as facility + FROM salIncomeApplyDetail as a + LEFT JOIN salIncomeApplyMaster as b ON a.BillNo = b.BillNo + LEFT JOIN ( + SELECT aMaster.BillNo,aMaster.BizPartnerId,aDetail.CU_MaterialId FROM arCheckBill as aMaster + LEFT JOIN arCheckBillDetail as aDetail ON aMaster.BizPartnerId = aDetail.FromBillNo + WHERE aMaster.BizPartnerId = '$contract_no' AND aMaster.TypeId = 'RVS' + ) AS c ON a.BillNo = c.BizPartnerId + WHERE a.BillNo = '$contract_no' + AND a.RowNo = '1' + "; $stmt = $connT8->prepare($sql); $stmt->execute(); $data = $stmt->fetch(PDO::FETCH_ASSOC); @@ -65,21 +65,21 @@ AND a.RowNo = '1' $checkBillNo = $data['CBno']; $sql = "SELECT -c.BillDate AS CheckBillDate -FROM arWriteOffBill AS a -LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo -LEFT JOIN -(SELECT temp1.*,arWriteOffBillDetail.* FROM arWriteOffBillDetail -LEFT JOIN - (SELECT - arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo - FROM arCheckBill - LEFT JOIN arCheckBillInvInfo - ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 -ON temp1.checkBillNo = arWriteOffBillDetail.FromBillNo) AS c -ON a.BillNo=c.BillNo -WHERE c.checkBillNo = '$checkBillNo' -"; + c.BillDate AS CheckBillDate + FROM arWriteOffBill AS a + LEFT JOIN arWriteOffBillRec AS b ON a.BillNo=b.BillNo + LEFT JOIN + (SELECT temp1.*,arWriteOffBillDetail.* FROM arWriteOffBillDetail + LEFT JOIN + (SELECT + arCheckBill.BillNo AS checkBillNo, arCheckBill.BillDate,arCheckBillInvInfo.InvoiceNo + FROM arCheckBill + LEFT JOIN arCheckBillInvInfo + ON arCheckBill.InvoiceBillNo=arCheckBillInvInfo.InvoiceBillNo) AS temp1 + ON temp1.checkBillNo = arWriteOffBillDetail.FromBillNo) AS c + ON a.BillNo=c.BillNo + WHERE c.checkBillNo = '$checkBillNo' + "; $stmt = $connT8->prepare($sql); $stmt->execute(); @@ -123,10 +123,10 @@ WHERE c.checkBillNo = '$checkBillNo' 牌價 服務費 應發人員 - 發放時間 - 應發金額 + 預計發放時間 + 獎金水庫 - 是否收款 + 狀態 檢視/發放 @@ -140,6 +140,7 @@ WHERE c.checkBillNo = '$checkBillNo' $total = empty($json->total) ? 0 : $json->total; $fee_per_st = empty($json->fee_per_st) ? 0 : $json->fee_per_st; $commission_fee = empty($json->commission_fee) ? 0 : $json->commission_fee; + $isPay = isPay($data['contract_no'], $connT8); ?> @@ -158,21 +159,21 @@ WHERE c.checkBillNo = '$checkBillNo' - + - + 發放獎金 - 查看詳情 + 查看詳情 diff --git a/wms/bonus/other/maintenance_contract_bonus_v2_1.php b/wms/bonus/other/maintenance_contract_bonus_v2_1.php index e55bae9e..d7768903 100644 --- a/wms/bonus/other/maintenance_contract_bonus_v2_1.php +++ b/wms/bonus/other/maintenance_contract_bonus_v2_1.php @@ -54,13 +54,13 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period, switch ($discount) { case ($discount >= 0.8): switch ($fee_per_st) { - case ($fee_per_st <= 3000): + case ($fee_per_st < 3000): $sales_bonus = ($fee_per_st - $commission_fee) * 0.6; break; - case ($fee_per_st >= 3001 and $fee_per_st <= 3499): + case ($fee_per_st >= 3000 and $fee_per_st < 3500): $sales_bonus = ($fee_per_st - $commission_fee) * 0.7; break; - case ($fee_per_st >= 3500 and $fee_per_st <= 3999): + case ($fee_per_st >= 3500 and $fee_per_st < 4000): $sales_bonus = ($fee_per_st - $commission_fee) * 0.8; break; case ($fee_per_st >= 4000): diff --git a/wms/contract-repair/contract-renovate-input.php b/wms/contract-repair/contract-renovate-input.php index 75369de0..deaeb0cb 100644 --- a/wms/contract-repair/contract-renovate-input.php +++ b/wms/contract-repair/contract-renovate-input.php @@ -143,7 +143,7 @@ $contractSalesman = $stmt->fetchAll(PDO::FETCH_ASSOC); - + - - - - - + + + + + --> - - 安裝 - 5、安裝完畢款 - - - - - - - - - - - - 6、驗收款 - - - - - - - - - - - - 7、其他 - - - - - - - - - - + + 安裝 + 5、安裝完畢款 + + + + + + + + + + + + 6、驗收款 + + + + + + + + + + + + 7、其他 + + + + + + + + + + - - 合計 - - - - - - - - - - - - + + 合計 + + + + + + + + + + + + - - + + - + - + - - + + \ No newline at end of file