From 7d2ee3cef2e0d68ba6400bc5957640d2771bbf4c Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 16 九月 2026 18:05:40 +0800
Subject: [PATCH] refactor: 单据审核改为审批配置状态机(新增:audit接口/审核人字段/DB变更脚本)

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptService.java |   36 +++++++++++++++++++-----------------
 1 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptService.java
index 242c749..2b1e8fa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/miscreceipt/MesWmMiscReceiptService.java
@@ -6,8 +6,7 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.miscreceipt.MesWmMiscReceiptDO;
 import jakarta.validation.Valid;
 
-import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 /**
  * MES 鏉傞」鍏ュ簱鍗� Service 鎺ュ彛
@@ -15,11 +14,6 @@
  * @author 瓒呯骇绠$悊鍛�
  */
 public interface MesWmMiscReceiptService {
-
-    /**
-     * 鏉傞」鍏ュ簱 BPM 瀹℃壒鍒嗙被缂栫爜
-     */
-    String APPROVE_CATEGORY_CODE = "misc_receipt_approve";
 
     /**
      * 鍒涘缓鏉傞」鍏ュ簱鍗�
@@ -60,27 +54,35 @@
     PageResult<MesWmMiscReceiptDO> getMiscReceiptPage(MesWmMiscReceiptPageReqVO pageReqVO);
 
     /**
-     * 鎻愪氦鏉傞」鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級锛屽垱寤� BPM 娴佺▼瀹炰緥
+     * 鎻愪氦鏉傞」鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級
+     *
+     * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔$紪鐮� misc_receipt_approve锛夛紝
+     * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
      *
      * @param id 缂栧彿
-     * @param processDefinitionKey 娴佺▼瀹氫箟 Key
      */
-    void submitMiscReceiptApproval(Long id, String processDefinitionKey);
+    void submitMiscReceiptApproval(Long id);
 
     /**
-     * 鏇存柊鏉傞」鍏ュ簱鍗曞鎵圭姸鎬侊紙瀹℃壒涓� 鈫� 宸插鎵�/鑽夌/宸插彇娑堬級
+     * 鑾峰緱鏉傞」鍏ュ簱鍗曞鎵圭殑瀹℃牳浜虹紪鍙烽泦鍚�
      *
-     * @param id 缂栧彿
-     * @param bpmResult BPM 瀹℃壒缁撴灉
+     * 渚涘墠绔垽鏂綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀簲灞曠ず銆屽鏍搞�嶆寜閽紱鏈厤缃椂杩斿洖绌洪泦鍚堛��
+     *
+     * @return 瀹℃牳浜虹敤鎴风紪鍙烽泦鍚�
      */
-    void updateMiscReceiptAuditStatus(Long id, Integer bpmResult);
+    Set<Long> getMiscReceiptApproverUserIds();
 
     /**
-     * 鑾峰彇鏉傞」鍏ュ簱瀹℃壒鍙敤鐨� BPM 娴佺▼瀹氫箟鍒楄〃
+     * 瀹℃牳鏉傞」鍏ュ簱鍗曪紙瀹℃壒涓� 鈫� 宸插鎵� / 鑽夌锛�
      *
-     * @return 娴佺▼瀹氫箟鍒楄〃锛坕d/key/name锛�
+     * 浠呬笟鍔$紪鐮� misc_receipt_approve 閰嶇疆鐨勫鏍镐汉鍙搷浣滐紙澶氫汉鏃舵垨绛撅級锛屼笖浠呭湪瀹℃壒涓姸鎬佷笅鍏佽銆�
+     * 瀹℃牳閫氳繃缃负宸插鎵癸紙鍙墽琛屽叆搴擄級锛涘鏍镐笉閫氳繃蹇呴』濉啓鍘熷洜锛岄��鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜ゃ��
+     *
+     * @param id           缂栧彿
+     * @param pass         鏄惁閫氳繃锛宼rue=閫氳繃 / false=涓嶉�氳繃
+     * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
      */
-    List<Map<String, Object>> getMiscReceiptApprovalProcessDefinitionList();
+    void auditMiscReceipt(Long id, Boolean pass, String reviewRemark);
 
     /**
      * 鎵ц鍏ュ簱锛堝凡瀹℃壒 鈫� 宸插畬鎴愶級锛屾洿鏂板簱瀛樺彴璐�

--
Gitblit v1.9.3