Merge branch 'develop'

2025-10-12 17:10:14 +08:00
parent 3a7449e2e9
commit 89d633389c
43 changed files with 4173 additions and 364 deletions
@@ -393,6 +393,44 @@ class StockOrdersService
        return $this->postProcess('Approval', $item);
    }

+    /**
+     * 作废审批
+     */
+    public function serviceApprovalNullify(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'approval');
+        $item = $this->logicShow($config);
+        $this->approvalNullify($item);
+        return $this->postProcess('Approval', $item);
+    }
+
+    /**
+     * 审批作废
+     */
+    public function approvalNullify($item)
+    {
+        $appro = new \app\common\utils\approval\service\ApprovalFlowService();
+        $appro->startNullify('stock_orders_nullify', 'stock_orders', $item->id, [], $item->salesperson_id);
+    }
+
+    /**
+     * 撤销审批
+     */
+    public function serviceApprovalRevoke(Request $request)
+    {
+        $config = $this->buildQueryConfig($request, 'approval');
+        $item = $this->logicShow($config);
+        $this->approvalRevoke($item);
+        return $this->postProcess('Approval', $item);
+    }
+
+    public function approvalRevoke($item)
+    {
+        $instance = \app\common\model\ApprovalInstances::where('biz_id', $item->id)->where('flow_type', 'stock_orders')->first();
+        $appro = new \app\common\utils\approval\service\ApprovalFlowService();
+        $appro->revoke($instance->id, $item->salesperson_id);
+    }
+
    /**
     * 创建
     *