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

Merge branch 'hotfix/Hotfix-1' into develop

Browse Source 
# Conflicts:
#	app/common/service/StockOrdersService.php
This commit is contained in:
mzl
2025-12-25 16:08:10 +08:00
parent db7f5d568c
commit 83ff52c1a0
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/service/StockOrdersService.php
+1 -4
View File
@@ -228,10 +228,7 @@ class StockOrdersService
flg('备货单【'.$order->order_no.'】创建终版成功，但更新原单失败'); flg('备货单【'.$order->order_no.'】创建终版成功，但更新原单失败');
} }
$orderFinal = StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->first(); StockOrders::where('object_id', $res->object_id)->where('is_final', 1)->where('approval_status', 3)->destroy();
if ($orderFinal) {
$orderFinal->delete();
}
} }
// 启动审批 // 启动审批
if ($res->approval_status == 1) { if ($res->approval_status == 1) {