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

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

@ -12,27 +12,27 @@
// | author: likeadminTeam // | author: likeadminTeam
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
namespace app\adminapi\logic\material; namespace app\adminapi\logic\material;
use app\common\model\dept\Dept; use app\common\logic\BaseLogic;
use app\common\model\dept\Orgs; use app\common\model\dept\Dept;
use app\common\model\material\MaterialPurchaseRequest; use app\common\model\dept\Orgs;
use app\common\logic\BaseLogic; use app\common\model\material\MaterialPurchaseRequest;
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;
use app\common\model\project\ProjectMaterialBudgetDetail; use app\common\model\project\ProjectMaterialBudgetDetail;
use think\facade\Db; use think\facade\Db;
/** /**
* 材料采购申请逻辑 * 材料采购申请逻辑
* Class MaterialPurchaseRequestLogic * Class MaterialPurchaseRequestLogic
* @package app\adminapi\logic\material * @package app\adminapi\logic\material
*/ */
class MaterialPurchaseRequestLogic extends BaseLogic class MaterialPurchaseRequestLogic extends BaseLogic
{ {
/** /**
@ -42,7 +42,7 @@ class MaterialPurchaseRequestLogic extends BaseLogic
* @author likeadmin * @author likeadmin
* @date 2024/01/09 13:47 * @date 2024/01/09 13:47
*/ */
public static function add(array $params,$admin_id): bool public static function add(array $params, $admin_id): bool
{ {
Db::startTrans(); Db::startTrans();
try { try {
@ -54,10 +54,9 @@ class MaterialPurchaseRequestLogic extends BaseLogic
'apply_date' => strtotime($params['apply_date']), 'apply_date' => strtotime($params['apply_date']),
'arrival_date' => strtotime($params['arrival_date']), 'arrival_date' => strtotime($params['arrival_date']),
'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,
@ -65,11 +64,11 @@ class MaterialPurchaseRequestLogic extends BaseLogic
'remark' => $item['remark'] ?? '', 'remark' => $item['remark'] ?? '',
]); ]);
//预算数量 //预算数量
$project_material_budget_detail = ProjectMaterialBudgetDetail::field('num')->where('id',$item['project_material_budget_detail_id'])->findOrEmpty(); $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'); $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){ 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()]); ProjectMaterialBudgetDetail::where('id', $item['project_material_budget_detail_id'])->update(['is_residual' => 1, 'update_time' => time()]);
} }
} }
Db::commit(); Db::commit();
@ -100,8 +99,32 @@ class MaterialPurchaseRequestLogic extends BaseLogic
'apply_date' => strtotime($params['apply_date']), 'apply_date' => strtotime($params['apply_date']),
'arrival_date' => strtotime($params['arrival_date']), 'arrival_date' => strtotime($params['arrival_date']),
'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) {
@ -135,22 +158,23 @@ class MaterialPurchaseRequestLogic extends BaseLogic
public static function detail($params): array public static function detail($params): array
{ {
$data = MaterialPurchaseRequest::field('id,org_id,dept_id,project_id,material_purchase_request_code,apply_date,arrival_date,remark,annex,approve_id')->findOrEmpty($params['id']); $data = MaterialPurchaseRequest::field('id,org_id,dept_id,project_id,material_purchase_request_code,apply_date,arrival_date,remark,annex,approve_id')->findOrEmpty($params['id']);
$org = Orgs::field('name')->where('id',$data['org_id'])->findOrEmpty(); $org = Orgs::field('name')->where('id', $data['org_id'])->findOrEmpty();
$dept = Dept::field('name')->where('id',$data['dept_id'])->findOrEmpty(); $dept = Dept::field('name')->where('id', $data['dept_id'])->findOrEmpty();
$project = Project::field('name,project_code')->where('id',$data['project_id'])->findOrEmpty(); $project = Project::field('name,project_code')->where('id', $data['project_id'])->findOrEmpty();
$data['org_name'] = $org['name']; $data['org_name'] = $org['name'];
$data['dept_name'] = $dept['name']; $data['dept_name'] = $dept['name'];
$data['project_name'] = $project['name']; $data['project_name'] = $project['name'];
$data['project_code'] = $project['project_code']; $data['project_code'] = $project['project_code'];
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
$data['approve_check_status'] = $approve_data['check_status']; $data['approve_check_status'] = $approve_data['check_status'];
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(); {
$approve_data = FlowApprove::where('id',$data['approve_id'])->findOrEmpty(); $data = MaterialPurchaseRequest::where('id', $params['id'])->findOrEmpty();
if(!empty($data['approve_id']) && $approve_data['check_status'] != 3){ $approve_data = FlowApprove::where('id', $data['approve_id'])->findOrEmpty();
if (!empty($data['approve_id']) && $approve_data['check_status'] != 3) {
self::setError('当前内容存在审核信息，请勿重复提交'); self::setError('当前内容存在审核信息，请勿重复提交');
return false; return false;
} }
@ -164,8 +188,8 @@ class MaterialPurchaseRequestLogic extends BaseLogic
$params['flow_id'], $params['flow_id'],
$admin_id $admin_id
); );
if($res){ if ($res) {
MaterialPurchaseRequest::where('id',$params['id'])->update([ MaterialPurchaseRequest::where('id', $params['id'])->update([
'approve_id' => $res, 'approve_id' => $res,
]); ]);
} }
@ -177,4 +201,4 @@ class MaterialPurchaseRequestLogic extends BaseLogic
return false; return false;
} }
} }
} }

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 '请选择材料预算明细';