From db7f5d568cd01711461d76306bb66f06c16bc4f0 Mon Sep 17 00:00:00 2001 From: mzl Date: Thu, 25 Dec 2025 16:00:35 +0800 Subject: [PATCH] Merge branch 'hotfix/Hotfix-1' into develop --- app/common/service/StockOrdersService.php | 5 +++++ app/crm/service/StockOrdersService.php | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php index 46949f1..484176c 100644 --- a/app/common/service/StockOrdersService.php +++ b/app/common/service/StockOrdersService.php @@ -227,6 +227,11 @@ class StockOrdersService if (!$order->save()) { flg('备货单【'.$order->order_no.'】创建终版成功，但更新原单失败'); } + + $orderFinal = StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->first(); + if ($orderFinal) { + $orderFinal->delete(); + } } // 启动审批 if ($res->approval_status == 1) { diff --git a/app/crm/service/StockOrdersService.php b/app/crm/service/StockOrdersService.php index 54edb17..f01f3b2 100644 --- a/app/crm/service/StockOrdersService.php +++ b/app/crm/service/StockOrdersService.php @@ -2,8 +2,10 @@ namespace app\crm\service; +use app\common\model\Role; use app\common\model\User; use app\common\model\UserGroupMembers; +use app\common\model\UserRoles; use support\Request; use support\exception\BusinessException; @@ -36,7 +38,9 @@ class StockOrdersService extends \app\common\service\StockOrdersService $config['order']['id'] = 'desc'; - $roles_id = array_intersect([1,6], $request->user->role_ids); + $user_role_id = UserRoles::where('user_id', $request->user->uid)->pluck('role_id')->toArray(); + //$roles_id = array_intersect([1,6], $request->user->role_ids); + $roles_id = array_intersect([1,6], $user_role_id); if (count($roles_id) == 0){ // if(in_array(4, $request->user->role_ids)){ //业务主管 // $report = User::where('report_to',$request->user->uid)->pluck('id')->toArray();