Merge branch 'hotfix/Hotfix-1' into develop

This commit is contained in:
mzl
2025-12-25 16:00:35 +08:00
parent bcf39b6037
commit db7f5d568c
2 changed files with 10 additions and 1 deletions
@@ -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) {