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/itemreceipt/MesWmItemReceiptService.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
index 038c8d0..c818aea 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptService.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.service.wm.itemreceipt;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.itemreceipt.vo.MesWmItemReceiptSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.itemreceipt.MesWmItemReceiptDO;
@@ -56,17 +58,16 @@
PageResult<MesWmItemReceiptDO> getItemReceiptPage(MesWmItemReceiptPageReqVO pageReqVO);
/**
- * 鎻愪氦閲囪喘鍏ュ簱鍗曞鎵癸紙鑽夌 鈫� 寰呬笂鏋讹級
- *
- * 瀹℃牳浜虹敱銆岀郴缁熺鐞� - 瀹℃壒閰嶇疆銆嶆寜涓氬姟绫诲瀷缁熶竴閰嶇疆锛堜笟鍔＄紪鐮� item_receipt_approve锛夛紝
- * 鎻愪氦鏃舵棤闇�鎸囧畾锛涙湭鍚敤瀹℃壒鎴栨湭閰嶇疆鏈夋晥瀹℃牳浜烘椂鎶涘嚭涓氬姟寮傚父銆�
+ * 鎻愪氦閲囪喘鍏ュ簱鍗曪紙鑽夌 鈫� 寰呬笂鏋讹級
*
* @param id 缂栧彿
*/
void submitItemReceipt(Long id);
/**
- * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
+ * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呮墽琛屽叆搴擄級
+ *
+ * 鏍￠獙姣忚涓婃灦鏄庣粏鏁伴噺涔嬪拰绛変簬琛屽叆搴撴暟閲忓悗鎺ㄨ繘鍗曟嵁鐘舵�併��
*
* @param id 缂栧彿
*/
@@ -93,6 +94,14 @@
* @return 閲囪喘鍏ュ簱鍗�
*/
MesWmItemReceiptDO validateItemReceiptEditable(Long id);
+
+ /**
+ * 鏍￠獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖琛屾暟鎹彲缂栬緫锛堜粎鑽夌锛�
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘鍏ュ簱鍗�
+ */
+ MesWmItemReceiptDO validateItemReceiptLineEditable(Long id);
/**
* 鏌ヨ鎸囧畾渚涘簲鍟嗙殑閲囪喘鍏ュ簱鍗曟暟閲�
@@ -157,4 +166,13 @@
*/
void auditItemReceipt(Long id, Boolean pass, String reviewRemark);
+ /**
+ * 瀵煎叆閲囪喘鍏ュ簱鍗�
+ *
+ * @param importList 瀵煎叆鏁版嵁
+ * @param updateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmItemReceiptImportRespVO importItemReceiptList(List<MesWmItemReceiptImportExcelVO> importList, boolean updateSupport);
+
}
--
Gitblit v1.9.3