From 962f78c8383e7c884ddb08c951c15e5ba6eb4cb8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 23 十月 2026 15:43:33 +0800
Subject: [PATCH] fix: 完善审批流程与业务状态校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java
index 1c8a618..f2ef011 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java
@@ -1,17 +1,17 @@
package cn.iocoder.yudao.module.mes.service.wm.equipmentreceipt;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.equipmentreceipt.vo.MesWmEquipmentReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.equipmentreceipt.MesWmEquipmentReceiptDO;
import jakarta.validation.Valid;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
public interface MesWmEquipmentReceiptService {
-
- String APPROVE_CATEGORY_CODE = "equipment_receipt_approve";
Long createEquipmentReceipt(@Valid MesWmEquipmentReceiptSaveReqVO createReqVO);
@@ -23,11 +23,45 @@
PageResult<MesWmEquipmentReceiptDO> getEquipmentReceiptPage(MesWmEquipmentReceiptPageReqVO pageReqVO);
- void submitEquipmentReceiptApproval(Long id, String processDefinitionKey);
+ /**
+ * 瀵煎叆璁惧鍏ュ簱鍗�
+ *
+ * @param importList 瀵煎叆鐨勮澶囧叆搴撳崟鍒楄〃
+ * @param updateSupport 鏄惁鏀寔鏇存柊锛堝凡瀛樺湪鐨勭紪鐮佷粎鍦ㄨ崏绋跨姸鎬佹椂鍏佽瑕嗙洊鏇存柊锛�
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmEquipmentReceiptImportRespVO importEquipmentReceiptList(List<MesWmEquipmentReceiptImportExcelVO> importList, boolean updateSupport);
- void updateEquipmentReceiptAuditStatus(Long id, Integer bpmResult);
+ /**
+ * 鎻愪氦璁惧鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級
+ *
+ * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� equipment_receipt_approve锛夛紝
+ * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
+ *
+ * @param id 缂栧彿
+ */
+ void submitEquipmentReceiptApproval(Long id);
- List<Map<String, Object>> getEquipmentReceiptApprovalProcessDefinitionList();
+ /**
+ * 鑾峰緱璁惧鍏ュ簱鍗曞鎵圭殑瀹℃牳浜虹紪鍙烽泦鍚�
+ *
+ * 渚涘墠绔垽鏂綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀簲灞曠ず銆屽鏍搞�嶆寜閽紱鏈厤缃椂杩斿洖绌洪泦鍚堛��
+ *
+ * @return 瀹℃牳浜虹敤鎴风紪鍙烽泦鍚�
+ */
+ Set<Long> getEquipmentReceiptApproverUserIds();
+
+ /**
+ * 瀹℃牳璁惧鍏ュ簱鍗曪紙瀹℃壒涓� 鈫� 宸插鎵� / 鑽夌锛�
+ *
+ * 浠呬笟鍔＄紪鐮� equipment_receipt_approve 閰嶇疆鐨勫鏍镐汉鍙搷浣滐紙澶氫汉鏃舵垨绛撅級锛屼笖浠呭湪瀹℃壒涓姸鎬佷笅鍏佽銆�
+ * 瀹℃牳閫氳繃缃负宸插鎵癸紙鍙墽琛屽叆搴擄級锛涘鏍镐笉閫氳繃蹇呴』濉啓鍘熷洜锛岄��鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜ゃ��
+ *
+ * @param id 缂栧彿
+ * @param pass 鏄惁閫氳繃锛宼rue=閫氳繃 / false=涓嶉�氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
+ */
+ void auditEquipmentReceipt(Long id, Boolean pass, String reviewRemark);
void finishEquipmentReceipt(Long id);
--
Gitblit v1.9.3