mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
weiz 2024-03-23 14:50:09 +08:00
parent 6a3fc45e04
commit be12b73d78
2 changed files with 57 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/adminapi/controller/finance/FinancePaymentReceiptDifferenceController.php
View File

@ -12,9 +12,16 @@
use app\common\model\finance\FinanceReceiptRecord; use app\common\model\finance\FinanceReceiptRecord;
use app\common\model\project\Project; use app\common\model\project\Project;
use app\common\model\supplier\Supplier; use app\common\model\supplier\Supplier;
use think\App;
class FinancePaymentReceiptDifferenceController extends BaseAdminController class FinancePaymentReceiptDifferenceController extends BaseAdminController
{ {
public function __construct(App $app)
{
parent::__construct($app);
bcscale(2);
}
//采购付款与收票差异 //采购付款与收票差异
public function procure(): \think\response\Json public function procure(): \think\response\Json
{ {
@ -44,9 +51,9 @@
//已收票金额 //已收票金额
$item['has_receipt_amount'] = FinanceReceiptRecord::where('contract_id', $item['id'])->where('contract_type', 1)->sum('invoice_amount'); $item['has_receipt_amount'] = FinanceReceiptRecord::where('contract_id', $item['id'])->where('contract_type', 1)->sum('invoice_amount');
//收票未付款 //收票未付款
$item['has_receipt_not_payment_amount'] = ($item['has_receipt_amount'] - $item['has_payment_amount']) <= 0 ? 0 : $item['has_receipt_amount'] - $item['has_payment_amount']; $item['has_receipt_not_payment_amount'] = max(bcsub($item['has_receipt_amount'], $item['has_payment_amount']), 0);
//付款未收票 //付款未收票
$item['has_payment_not_receipt_amount'] = ($item['has_payment_amount'] - $item['has_receipt_amount']) <= 0 ? 0 : $item['has_payment_amount'] - $item['has_receipt_amount']; $item['has_payment_not_receipt_amount'] = max(bcsub($item['has_payment_amount'], $item['has_receipt_amount']), 0);
return $item; return $item;
})->toArray(); })->toArray();
$count = ProcurementContract::field('id')->where($where)->count(); $count = ProcurementContract::field('id')->where($where)->count();
@ -92,9 +99,9 @@
//已收票金额 //已收票金额
$item['has_receipt_amount'] = FinanceReceiptRecord::where('contract_id', $item['id'])->where('contract_type', 2)->sum('invoice_amount'); $item['has_receipt_amount'] = FinanceReceiptRecord::where('contract_id', $item['id'])->where('contract_type', 2)->sum('invoice_amount');
//收票未付款 //收票未付款
$item['has_receipt_not_payment_amount'] = ($item['has_receipt_amount'] - $item['has_payment_amount']) <= 0 ? 0 : $item['has_receipt_amount'] - $item['has_payment_amount']; $item['has_receipt_not_payment_amount'] = max(bcsub($item['has_receipt_amount'], $item['has_payment_amount']), 0);
//付款未收票 //付款未收票
$item['has_payment_not_receipt_amount'] = ($item['has_payment_amount'] - $item['has_receipt_amount']) <= 0 ? 0 : $item['has_payment_amount'] - $item['has_receipt_amount']; $item['has_payment_not_receipt_amount'] = max(bcsub($item['has_payment_amount'], $item['has_receipt_amount']), 0);
return $item; return $item;
})->toArray(); })->toArray();
$count = SubcontractingContract::field('id')->where($where)->count(); $count = SubcontractingContract::field('id')->where($where)->count();

5
app/adminapi/controller/finance/FinanceRefundInvoiceDifferenceController.php
View File

@ -14,6 +14,7 @@
{ {
public function lists(): \think\response\Json public function lists(): \think\response\Json
{ {
bcscale(2);
$params = $this->request->get(['page_no', 'page_size', 'contract_code', 'project_id']); $params = $this->request->get(['page_no', 'page_size', 'contract_code', 'project_id']);
$pageNo = empty($params['page_no']) ? 1 : $params['page_no']; $pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
$pageSize = empty($params['page_size']) ? 15 : $params['page_size']; $pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
@ -42,9 +43,9 @@
//已开票金额 //已开票金额
$item['has_invoice_amount'] = FinanceInvoiceApply::where('contract_id', $item['id'])->sum('invoicing_amount'); $item['has_invoice_amount'] = FinanceInvoiceApply::where('contract_id', $item['id'])->sum('invoicing_amount');
//开票未回款 //开票未回款
$item['has_invoice_not_refund_amount'] = ($item['has_invoice_amount'] - $item['has_refund_amount']) <= 0 ? 0 : $item['has_invoice_amount'] - $item['has_refund_amount']; $item['has_invoice_not_refund_amount'] = max(bcsub($item['has_invoice_amount'], $item['has_refund_amount']), 0);
//回款未开票 //回款未开票
$item['has_refund_not_invoice_amount'] = ($item['has_refund_amount'] - $item['has_invoice_amount']) <= 0 ? 0 : $item['has_refund_amount'] - $item['has_invoice_amount']; $item['has_refund_not_invoice_amount'] = max(bcsub($item['has_refund_amount'], $item['has_invoice_amount']), 0);
unset($item['amount']); unset($item['amount']);
return $item; return $item;
})->toArray(); })->toArray();