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-01-22 16:25:08 +08:00
parent 7b57adc84b
commit 5e75ea317b
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/adminapi/lists/contract/SubcontractingContractLists.php
View File

@ -62,7 +62,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
public function lists(): array public function lists(): array
{ {
return SubcontractingContract::where($this->searchWhere) return SubcontractingContract::where($this->searchWhere)
->field('id,project_id,supplier_id,contract_no,contract_name,contract_type,signing_date,contract_amount') ->field('id,project_id,supplier_id,contract_no,contract_name,contract_type,signing_date')
->limit($this->limitOffset, $this->limitLength) ->limit($this->limitOffset, $this->limitLength)
->order(['id' => 'desc']) ->order(['id' => 'desc'])
->select()->each(function($data){ ->select()->each(function($data){
@ -73,6 +73,7 @@ class SubcontractingContractLists extends BaseAdminDataLists implements ListsSea
$data['supplier_name'] = $supplier['supplier_name']; $data['supplier_name'] = $supplier['supplier_name'];
$data['supplier_code'] = $supplier['supplier_code']; $data['supplier_code'] = $supplier['supplier_code'];
$data['contract_type'] = $data->contract_type_text; $data['contract_type'] = $data->contract_type_text;
$data['contract_amount'] = SubcontractingContractDetail::where('contract_id',$data['id'])->sum('amount_including_tax');
//洽商金额 //洽商金额
$data['negotiation_amount'] = SubcontractingContractNegotiation::where('subcontracting_contract_id',$data['id'])->sum('negotiation_amount'); $data['negotiation_amount'] = SubcontractingContractNegotiation::where('subcontracting_contract_id',$data['id'])->sum('negotiation_amount');
//实际合同金额 //实际合同金额

14
app/adminapi/logic/contract/SubcontractingContractLogic.php
View File

@ -54,10 +54,8 @@ class SubcontractingContractLogic extends BaseLogic
$tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value'); $tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value');
//合同金额\不含税金额 //合同金额\不含税金额
$contract_amount = 0; $contract_amount = 0;
$amount_excluding_tax = 0;
foreach($subcontracting_contract_detail as $v){ foreach($subcontracting_contract_detail as $v){
$contract_amount += $v['price']*$v['num']; $contract_amount += $v['price']*$v['num'];
$amount_excluding_tax += $v['num'] * $v['price'] * (1- $tax_rate_dict[$v['tax_rate']] / 100);
} }
Db::startTrans(); Db::startTrans();
try { try {
@ -72,10 +70,6 @@ class SubcontractingContractLogic extends BaseLogic
'signing_date' => strtotime($params['signing_date']), 'signing_date' => strtotime($params['signing_date']),
'pay_type' => $params['pay_type'], 'pay_type' => $params['pay_type'],
'account_period' => $params['account_period'], 'account_period' => $params['account_period'],
//合同金额
'contract_amount' => $contract_amount,
//不含税金额
'amount_excluding_tax' => $amount_excluding_tax,
//质保金 //质保金
'retention_money' => $contract_amount * ($params['retention_money_rate'] / 100), 'retention_money' => $contract_amount * ($params['retention_money_rate'] / 100),
//质保金比例 //质保金比例
@ -139,10 +133,8 @@ class SubcontractingContractLogic extends BaseLogic
$tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value'); $tax_rate_dict = DictData::where('type_value','tax_rate')->column('name','value');
//合同金额\不含税金额 //合同金额\不含税金额
$contract_amount = 0; $contract_amount = 0;
$amount_excluding_tax = 0;
foreach($subcontracting_contract_detail as $v){ foreach($subcontracting_contract_detail as $v){
$contract_amount += $v['price']*$v['num']; $contract_amount += $v['price']*$v['num'];
$amount_excluding_tax += $v['num'] * $v['price'] * (1- $tax_rate_dict[$v['tax_rate']] / 100);
} }
Db::startTrans(); Db::startTrans();
try { try {
@ -156,10 +148,6 @@ class SubcontractingContractLogic extends BaseLogic
'signing_date' => strtotime($params['signing_date']), 'signing_date' => strtotime($params['signing_date']),
'pay_type' => $params['pay_type'], 'pay_type' => $params['pay_type'],
'account_period' => $params['account_period'], 'account_period' => $params['account_period'],
//合同金额
'contract_amount' => $contract_amount,
//不含税金额
'amount_excluding_tax' => $amount_excluding_tax,
//质保金 //质保金
'retention_money' => $contract_amount * ($params['retention_money_rate'] / 100), 'retention_money' => $contract_amount * ($params['retention_money_rate'] / 100),
//质保金比例 //质保金比例
@ -259,6 +247,8 @@ class SubcontractingContractLogic extends BaseLogic
$data['contract_type_text'] = $data->contract_type_text; $data['contract_type_text'] = $data->contract_type_text;
$data['pay_type_text'] = $data->pay_type_text; $data['pay_type_text'] = $data->pay_type_text;
$data['account_period_text'] = $data->account_period_text; $data['account_period_text'] = $data->account_period_text;
$data['contract_amount'] = SubcontractingContractDetail::where('contract_id',$data['id'])->sum('amount_including_tax');
$data['amount_excluding_tax'] = SubcontractingContractDetail::where('contract_id',$data['id'])->sum('amount_excluding_tax');
return $data->toArray(); return $data->toArray();
} }
} }