Merge pull request 'update' (#144) from zhangwei into dev
Reviewed-on: #144
This commit is contained in:
weiz
commit
0892a61bae
@ -43,54 +43,6 @@ class ProcurementContractDetailController extends BaseAdminController
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 添加采购明细
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/04 22:30
|
||||
*/
|
||||
public function add()
|
||||
{
|
||||
$params = (new ProcurementContractDetailValidate())->post()->goCheck('add');
|
||||
$result = ProcurementContractDetailLogic::add($params);
|
||||
if (true === $result) {
|
||||
return $this->success('添加成功', [], 1, 1);
|
||||
}
|
||||
return $this->fail(ProcurementContractDetailLogic::getError());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 编辑采购明细
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/04 22:30
|
||||
*/
|
||||
public function edit()
|
||||
{
|
||||
$params = (new ProcurementContractDetailValidate())->post()->goCheck('edit');
|
||||
$result = ProcurementContractDetailLogic::edit($params);
|
||||
if (true === $result) {
|
||||
return $this->success('编辑成功', [], 1, 1);
|
||||
}
|
||||
return $this->fail(ProcurementContractDetailLogic::getError());
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 删除采购明细
|
||||
* @return \think\response\Json
|
||||
* @author likeadmin
|
||||
* @date 2023/12/04 22:30
|
||||
*/
|
||||
public function delete()
|
||||
{
|
||||
$params = (new ProcurementContractDetailValidate())->post()->goCheck('delete');
|
||||
ProcurementContractDetailLogic::delete($params);
|
||||
return $this->success('删除成功', [], 1, 1);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @notes 获取采购明细详情
|
||||
* @return \think\response\Json
|
||||
|
||||
@ -16,8 +16,16 @@ namespace app\adminapi\lists\contract;
|
||||
|
||||
|
||||
use app\adminapi\lists\BaseAdminDataLists;
|
||||
use app\common\model\contract\ProcurementContract;
|
||||
use app\common\model\contract\ProcurementContractDetail;
|
||||
use app\common\lists\ListsSearchInterface;
|
||||
use app\common\model\material\Material;
|
||||
use app\common\model\material\MaterialClassify;
|
||||
use app\common\model\material\MaterialPurchaseRequest;
|
||||
use app\common\model\material\MaterialPurchaseRequestDetail;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectMaterialBudgetDetail;
|
||||
use app\common\model\supplier\Supplier;
|
||||
|
||||
|
||||
/**
|
||||
@ -38,7 +46,7 @@ class ProcurementContractDetailLists extends BaseAdminDataLists implements Lists
|
||||
public function setSearch(): array
|
||||
{
|
||||
return [
|
||||
'=' => ['procurement_contract_id', 'material_procurement_application_id'],
|
||||
'=' => ['contract_id'],
|
||||
];
|
||||
}
|
||||
|
||||
@ -55,10 +63,40 @@ class ProcurementContractDetailLists extends BaseAdminDataLists implements Lists
|
||||
public function lists(): array
|
||||
{
|
||||
return ProcurementContractDetail::where($this->searchWhere)
|
||||
->field(['id', 'procurement_contract_id', 'material_procurement_application_id', 'num', 'unit_price_including_tax', 'tax_rate', 'amount_excluding_tax', 'amount_including_tax'])
|
||||
->field('id,material_purchase_request_detail_id,contract_id,num,price,tax_rate,amount_excluding_tax,amount_including_tax')
|
||||
->limit($this->limitOffset, $this->limitLength)
|
||||
->order(['id' => 'desc'])
|
||||
->select()
|
||||
->select()->each(function($data){
|
||||
$contract = ProcurementContract::field('contract_no,project_id,supplier_id,contract_type')->where('id',$data['contract_id'])->findOrEmpty();
|
||||
$project = Project::field('name,project_code')->where('id',$contract['project_id'])->findOrEmpty();
|
||||
$supplier = Supplier::field('supplier_code,supplier_name')->where('id',$contract['supplier_id'])->findOrEmpty();
|
||||
$material_purchase_request_detail = MaterialPurchaseRequestDetail::field('material_purchase_request_id,project_material_budget_detail_id')->where('id',$data['material_purchase_request_detail_id'])->findOrEmpty();
|
||||
$material_purchase_request = MaterialPurchaseRequest::field('material_purchase_request_code')->where('id',$material_purchase_request_detail['material_purchase_request_id'])->findOrEmpty();
|
||||
$project_material_budget_detail = ProjectMaterialBudgetDetail::field('material_id')->where('id',$material_purchase_request_detail['project_material_budget_detail_id'])->findOrEmpty();
|
||||
$material = Material::field('first_level,second_level,three_level,name,code,specs,brand,parameter_description,unit')->where('id',$project_material_budget_detail['material_id'])->findOrEmpty();
|
||||
$material_classify = MaterialClassify::where('id','in',[$material['first_level'],$material['second_level'],$material['three_level']])->column('name','id');
|
||||
$data['project_code'] = $project['project_code'];
|
||||
$data['project_name'] = $project['name'];
|
||||
$data['supplier_code'] = $supplier['supplier_code'];
|
||||
$data['supplier_name'] = $supplier['supplier_name'];
|
||||
$data['contract_no'] = $contract['contract_no'];
|
||||
$data['contract_type'] = $contract->contract_type_text;
|
||||
$data['material_purchase_request_code'] = $material_purchase_request['material_purchase_request_code'];
|
||||
$data['material_first_level'] = $material_classify[$material['first_level']];
|
||||
$data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : '';
|
||||
$data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : '';
|
||||
$data['material_name'] = $material['name'];
|
||||
$data['material_code'] = $material['code'];
|
||||
$data['material_specs'] = $material['specs'];
|
||||
$data['material_brand'] = $material['brand'];
|
||||
$data['material_parameter_description'] = $material['parameter_description'];
|
||||
$data['material_unit'] = $material['unit'];
|
||||
//已入库数量
|
||||
$data['has_storage_num'] = 0;
|
||||
//未入库数量
|
||||
$data['not_storage_num'] = $data['num'] - $data['has_storage_num'];
|
||||
return $data;
|
||||
})
|
||||
->toArray();
|
||||
}
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
|
||||
{
|
||||
return [
|
||||
'=' => ['supplier_id', 'project_id'],
|
||||
'%like%' => ['contract_no','']
|
||||
'%like%' => ['contract_no']
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
@ -15,8 +15,16 @@
|
||||
namespace app\adminapi\logic\contract;
|
||||
|
||||
|
||||
use app\common\model\contract\ProcurementContract;
|
||||
use app\common\model\contract\ProcurementContractDetail;
|
||||
use app\common\logic\BaseLogic;
|
||||
use app\common\model\material\Material;
|
||||
use app\common\model\material\MaterialClassify;
|
||||
use app\common\model\material\MaterialPurchaseRequest;
|
||||
use app\common\model\material\MaterialPurchaseRequestDetail;
|
||||
use app\common\model\project\Project;
|
||||
use app\common\model\project\ProjectMaterialBudgetDetail;
|
||||
use app\common\model\supplier\Supplier;
|
||||
use think\facade\Db;
|
||||
|
||||
|
||||
@ -113,6 +121,31 @@ class ProcurementContractDetailLogic extends BaseLogic
|
||||
*/
|
||||
public static function detail($params): array
|
||||
{
|
||||
return ProcurementContractDetail::findOrEmpty($params['id'])->toArray();
|
||||
$data = ProcurementContractDetail::field('id,material_purchase_request_detail_id,contract_id,num,price,tax_rate,amount_excluding_tax,amount_including_tax')->findOrEmpty($params['id']);
|
||||
$contract = ProcurementContract::field('contract_no,project_id,supplier_id,contract_type')->where('id',$data['contract_id'])->findOrEmpty();
|
||||
$project = Project::field('name,project_code')->where('id',$contract['project_id'])->findOrEmpty();
|
||||
$supplier = Supplier::field('supplier_code,supplier_name')->where('id',$contract['supplier_id'])->findOrEmpty();
|
||||
$material_purchase_request_detail = MaterialPurchaseRequestDetail::field('material_purchase_request_id,project_material_budget_detail_id')->where('id',$data['material_purchase_request_detail_id'])->findOrEmpty();
|
||||
$material_purchase_request = MaterialPurchaseRequest::field('material_purchase_request_code')->where('id',$material_purchase_request_detail['material_purchase_request_id'])->findOrEmpty();
|
||||
$project_material_budget_detail = ProjectMaterialBudgetDetail::field('material_id')->where('id',$material_purchase_request_detail['project_material_budget_detail_id'])->findOrEmpty();
|
||||
$material = Material::field('first_level,second_level,three_level,name,code,specs,brand,parameter_description,unit')->where('id',$project_material_budget_detail['material_id'])->findOrEmpty();
|
||||
$material_classify = MaterialClassify::where('id','in',[$material['first_level'],$material['second_level'],$material['three_level']])->column('name','id');
|
||||
$data['project_code'] = $project['project_code'];
|
||||
$data['project_name'] = $project['name'];
|
||||
$data['supplier_code'] = $supplier['supplier_code'];
|
||||
$data['supplier_name'] = $supplier['supplier_name'];
|
||||
$data['contract_no'] = $contract['contract_no'];
|
||||
$data['contract_type'] = $contract->contract_type_text;
|
||||
$data['material_purchase_request_code'] = $material_purchase_request['material_purchase_request_code'];
|
||||
$data['material_first_level'] = $material_classify[$material['first_level']];
|
||||
$data['material_second_level'] = !empty($material_classify[$material['second_level']]) ? $material_classify[$material['second_level']] : '';
|
||||
$data['material_three_level'] = !empty($material_classify[$material['three_level']]) ? $material_classify[$material['three_level']] : '';
|
||||
$data['material_name'] = $material['name'];
|
||||
$data['material_code'] = $material['code'];
|
||||
$data['material_specs'] = $material['specs'];
|
||||
$data['material_brand'] = $material['brand'];
|
||||
$data['material_parameter_description'] = $material['parameter_description'];
|
||||
$data['material_unit'] = $material['unit'];
|
||||
return $data->toArray();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user