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-04-10 17:27:44 +08:00
parent 49d538479a
commit 55d4fe7d21
2 changed files with 193 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/adminapi/logic/material/MaterialPurchaseRequestLogic.php
View File

@ -15,10 +15,10 @@
namespace app\adminapi\logic\material; namespace app\adminapi\logic\material;
use app\common\logic\BaseLogic;
use app\common\model\dept\Dept; use app\common\model\dept\Dept;
use app\common\model\dept\Orgs; use app\common\model\dept\Orgs;
use app\common\model\material\MaterialPurchaseRequest; use app\common\model\material\MaterialPurchaseRequest;
use app\common\logic\BaseLogic;
use app\common\model\material\MaterialPurchaseRequestDetail; use app\common\model\material\MaterialPurchaseRequestDetail;
use app\common\model\oa\FlowApprove; use app\common\model\oa\FlowApprove;
use app\common\model\project\Project; use app\common\model\project\Project;
@ -56,8 +56,7 @@ class MaterialPurchaseRequestLogic extends BaseLogic
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
foreach ($params['purchase_request_detail'] as $item) foreach ($params['purchase_request_detail'] as $item) {
{
MaterialPurchaseRequestDetail::create([ MaterialPurchaseRequestDetail::create([
'project_material_budget_detail_id' => $item['project_material_budget_detail_id'], 'project_material_budget_detail_id' => $item['project_material_budget_detail_id'],
'material_purchase_request_id' => $MaterialPurchaseRequestRes->id, 'material_purchase_request_id' => $MaterialPurchaseRequestRes->id,
@ -102,6 +101,30 @@ class MaterialPurchaseRequestLogic extends BaseLogic
'remark' => $params['remark'] ?? '', 'remark' => $params['remark'] ?? '',
'annex' => $params['annex'] ? json_encode($params['annex']) : null, 'annex' => $params['annex'] ? json_encode($params['annex']) : null,
]); ]);
foreach ($params['purchase_request_detail'] as $item) {
if (!empty($item['id'])) {
MaterialPurchaseRequestDetail::where('id', $item['id'])->update([
'project_material_budget_detail_id' => $item['project_material_budget_detail_id'],
'material_purchase_request_id' => $params['id'],
'num' => $item['num'],
'remark' => $item['remark'] ?? '',
]);
} else {
MaterialPurchaseRequestDetail::create([
'project_material_budget_detail_id' => $item['project_material_budget_detail_id'],
'material_purchase_request_id' => $params['id'],
'num' => $item['num'],
'remark' => $item['remark'] ?? '',
]);
}
//预算数量
$project_material_budget_detail = ProjectMaterialBudgetDetail::field('num')->where('id', $item['project_material_budget_detail_id'])->findOrEmpty();
//已经申购的数量
$purchase_request_num = MaterialPurchaseRequestDetail::where('project_material_budget_detail_id', $item['project_material_budget_detail_id'])->sum('num');
if ($project_material_budget_detail['num'] - $purchase_request_num - $item['num'] <= 0) {
ProjectMaterialBudgetDetail::where('id', $item['project_material_budget_detail_id'])->update(['is_residual' => 1, 'update_time' => time()]);
}
}
Db::commit(); Db::commit();
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -147,7 +170,8 @@ class MaterialPurchaseRequestLogic extends BaseLogic
return $data->toArray(); return $data->toArray();
} }
public static function approve($params,$admin_id): bool{ public static function approve($params, $admin_id): bool
{
$data = MaterialPurchaseRequest::where('id', $params['id'])->findOrEmpty(); $data = MaterialPurchaseRequest::where('id', $params['id'])->findOrEmpty();
$approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty(); $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) { if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {

6
app/adminapi/validate/material/MaterialPurchaseRequestValidate.php
View File

@ -170,6 +170,12 @@
return '申购明细数据格式错误'; return '申购明细数据格式错误';
} }
foreach ($detail as $v) { foreach ($detail as $v) {
if (!empty($v['id'])) {
$data = MaterialPurchaseRequestDetail::where('id', $v['id'])->findOrEmpty();
if ($data->isEmpty()) {
return '申购明细信息不存在';
}
}
$project_material_budget_detail = ProjectMaterialBudgetDetail::where('id', $v['project_material_budget_detail_id'])->findOrEmpty(); $project_material_budget_detail = ProjectMaterialBudgetDetail::where('id', $v['project_material_budget_detail_id'])->findOrEmpty();
if (empty($v['project_material_budget_detail_id'])) { if (empty($v['project_material_budget_detail_id'])) {
return '请选择材料预算明细'; return '请选择材料预算明细';