From e514129ff64e29b6d6450bd1448ce101d8e44973 Mon Sep 17 00:00:00 2001
From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com>
Date: Wed, 24 Dec 2025 14:02:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=B8=BB=E7=AE=A1?=
 =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8D=95=E5=8F=AA=E7=9C=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crm/service/StockOrdersService.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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();

From f2b7d40b172a09b97d499f8787ee23ba4aa8e6ea Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Thu, 25 Dec 2025 15:59:07 +0800
Subject: [PATCH 2/4] ts

---
 app/common/service/StockOrdersService.php | 5 +++++
 1 file changed, 5 insertions(+)

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) {

From 8072388da21652ca42fc618e9d8f7547c97f85cb Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Thu, 25 Dec 2025 16:07:33 +0800
Subject: [PATCH 3/4] ts

---
 app/common/service/StockOrdersService.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php
index 484176c..7f3122b 100644
--- a/app/common/service/StockOrdersService.php
+++ b/app/common/service/StockOrdersService.php
@@ -228,10 +228,7 @@ class StockOrdersService
                 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();
-            }
+            StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->destroy();
         }
         // 启动审批
         if ($res->approval_status == 1) {

From ece685fbe5d22e12db957bf375d2ba9f334ff44f Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Thu, 25 Dec 2025 16:09:50 +0800
Subject: [PATCH 4/4] ts

---
 app/common/service/StockOrdersService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/service/StockOrdersService.php b/app/common/service/StockOrdersService.php
index 7f3122b..3f72586 100644
--- a/app/common/service/StockOrdersService.php
+++ b/app/common/service/StockOrdersService.php
@@ -228,7 +228,7 @@ class StockOrdersService
                 flg('备货单【'.$order->order_no.'】创建终版成功，但更新原单失败');
             }
 
-            StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->destroy();
+            StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->delete();
         }
         // 启动审批
         if ($res->approval_status == 1) {