From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/equipmentreceipt/MesWmEquipmentReceiptService.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 ee49b25..7d06cd7 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,11 +1,14 @@
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.Set;
public interface MesWmEquipmentReceiptService {
@@ -19,6 +22,15 @@
MesWmEquipmentReceiptDO getEquipmentReceipt(Long id);
PageResult<MesWmEquipmentReceiptDO> getEquipmentReceiptPage(MesWmEquipmentReceiptPageReqVO pageReqVO);
+
+ /**
+ * 瀵煎叆璁惧鍏ュ簱鍗�
+ *
+ * @param importList 瀵煎叆鐨勮澶囧叆搴撳崟鍒楄〃
+ * @param updateSupport 鏄惁鏀寔鏇存柊锛堝凡瀛樺湪鐨勭紪鐮佷粎鍦ㄨ崏绋跨姸鎬佹椂鍏佽瑕嗙洊鏇存柊锛�
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmEquipmentReceiptImportRespVO importEquipmentReceiptList(List<MesWmEquipmentReceiptImportExcelVO> importList, boolean updateSupport);
/**
* 鎻愪氦璁惧鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 瀹℃壒涓級
@@ -51,6 +63,17 @@
*/
void auditEquipmentReceipt(Long id, Boolean pass, String reviewRemark);
+ /**
+ * 鍥炲啓 BPM 瀹℃壒缁撴灉锛堜緵 BPM 娴佺▼鐘舵�佺洃鍚櫒璋冪敤锛�
+ *
+ * 浠呭湪鍗曟嵁澶勪簬瀹℃壒涓椂鐢熸晥锛氶�氳繃=宸插鎵� / 涓嶉�氳繃=鑽夌 / 鍙栨秷=宸插彇娑堛��
+ *
+ * @param id 缂栧彿
+ * @param bpmStatus BPM 浠诲姟鐘舵�侊紝瑙� {@link cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum}
+ * @param reason 瀹℃壒鎰忚 / 鍙栨秷鍘熷洜
+ */
+ void updateEquipmentReceiptAuditStatus(Long id, Integer bpmStatus, String reason);
+
void finishEquipmentReceipt(Long id);
void cancelEquipmentReceipt(Long id);
--
Gitblit v1.9.3