From 83ff52c1a0ef9d0956c18403581b8c52840e7e2f Mon Sep 17 00:00:00 2001 From: mzl Date: Thu, 25 Dec 2025 16:08:10 +0800 Subject: [PATCH] Merge branch 'hotfix/Hotfix-1' into develop # Conflicts: # app/common/service/StockOrdersService.php --- 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) {