xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加审批时间轴&&调整采购单

Browse Source
This commit is contained in:
mzl
2025-09-24 17:38:04 +08:00
parent 07af16ed9d
commit 2a44802994
7 changed files with 299 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/PurchaseOrdersService.php
+70 -50
View File
@@ -74,6 +74,9 @@ class PurchaseOrdersService
$data['order_no'] = generateStockNo('CG');
$data['buyer_id'] = $request->user->uid;
$data['buyer_name'] = User::where('id', $request->user->uid)->value('name');
if ($data['is_draft'] == 0) {
$data['status'] = 1;
}
return $data;
}
@@ -102,52 +105,6 @@ class PurchaseOrdersService
});
}
/**
* 更新采购单
*
* @param Request $request
* @param array $data
* @return mixed
*/
public function serviceUpdate(Request $request, array $data = [], string $scene = 'update')
{
// 使用事务确保数据一致性
return Db::transaction(function () use ($request, $data, $scene) {
$data = $this->preProcess(ucfirst($scene), $data, $request);
// 构建查询条件
$config = $this->buildQueryConfig($request, $scene);
// 更新主表信息
$udata = $data;
unset($udata['stock_order']);
$updated = $this->logicUpdateBy($config, $udata);
// 获取更新后的数据
$order = $this->logicShow($config);
// 更新采购单明细
if (isset($data['stock_order'])) {
// 先删除原有的明细
PurchaseOrderItems::where('purchase_order_id', $order->id)->delete();
// 重新创建明细
foreach ($data['stock_order'] as $orderData) {
foreach ($orderData['stock_items'] as $item) {
PurchaseOrderItems::create([
'purchase_order_id' => $order->id,
'stock_id' => $orderData['stock_orders_id'],
'stock_items_id' => $item['stock_order_items_id'],
'stock_items_uqid' => $item['unique_id'],
]);
}
}
}
return $this->postProcess(ucfirst($scene), $order, ['is_resubmit'=>$data['is_resubmit']]);
});
}
/**
* 构建查询配置
*
@@ -213,7 +170,7 @@ class PurchaseOrdersService
*/
protected function afterServiceStore($res)
{
if ($res->status == 1) {
if ($res->is_draft == 0) {
$this->startApproval($res, ['resubmitted'=>0]);
}
return $res;
@@ -225,6 +182,69 @@ class PurchaseOrdersService
$appro->start('purchase_orders', 'purchase_orders', $item->id, ['resubmitted'=>0], $item->buyer_id);
}
public function beforeServiceUpdate(array $data, Request $request)
{
if ($data['is_draft'] == 0) {
$data['status'] = 1;
}
return $data;
}
/**
* 更新采购单
*
* @param Request $request
* @param array $data
* @return mixed
*/
public function serviceUpdate(Request $request, array $data = [], string $scene = 'update')
{
// 使用事务确保数据一致性
return Db::transaction(function () use ($request, $data, $scene) {
$data = $this->preProcess(ucfirst($scene), $data, $request);
// 构建查询条件
$config = $this->buildQueryConfig($request, $scene);
// 更新主表信息
$udata = $data;
unset($udata['stock_order']);
unset($udata['is_resubmit']);
unset($udata['approval_desc']);
$this->logicUpdateBy($config, $udata);
// 获取更新后的数据
$order = $this->logicShow($config);
// 更新采购单明细
if (isset($data['stock_order'])) {
// 先删除原有的明细
PurchaseOrderItems::where('purchase_order_id', $order->id)->delete();
// 重新创建明细
foreach ($data['stock_order'] as $orderData) {
foreach ($orderData['stock_items'] as $item) {
PurchaseOrderItems::create([
'purchase_order_id' => $order->id,
'stock_id' => $orderData['stock_orders_id'],
'stock_items_id' => $item['stock_order_items_id'],
'stock_items_uqid' => $item['unique_id'],
]);
}
}
}
return $this->postProcess(
ucfirst($scene),
$order,
[
'is_resubmit'=>$data['is_resubmit'],
'approval_desc'=>$data['approval_desc']
]
);
});
}
protected function afterServiceUpdate($res, $data)
{
if ($data['is_resubmit'] == 0 && $res->status == 1) {
@@ -238,10 +258,10 @@ class PurchaseOrdersService
// 审批服务
$appro = new \app\common\utils\approval\service\ApprovalFlowService();
// 重新提交
$appro->resubmit($instance->id, $instance->initiator_id, ['resubmitted'=>1], $data['remark']);
$appro->resubmit($instance->id, $instance->initiator_id, ['resubmitted'=>1], $data['approval_desc']);
// 添加到讨论
if (!empty($data['remark'])) {
$appro->postDiscussion($instance->id, $instance->initiator_id, $data['remark'], false, [], 'name');
if (!empty($data['approval_desc'])) {
$appro->postDiscussion($instance->id, $instance->initiator_id, $data['approval_desc'], false, [], 'name');
}
}
return $res;