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 | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 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 eecab63..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;
@@ -8,6 +10,7 @@
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
@@ -62,7 +65,9 @@
void submitItemReceipt(Long id);
/**
- * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呭叆搴擄級
+ * 鎵ц涓婃灦锛堝緟涓婃灦 鈫� 寰呮墽琛屽叆搴擄級
+ *
+ * 鏍￠獙姣忚涓婃灦鏄庣粏鏁伴噺涔嬪拰绛変簬琛屽叆搴撴暟閲忓悗鎺ㄨ繘鍗曟嵁鐘舵�併��
*
* @param id 缂栧彿
*/
@@ -89,6 +94,14 @@
* @return 閲囪喘鍏ュ簱鍗�
*/
MesWmItemReceiptDO validateItemReceiptEditable(Long id);
+
+ /**
+ * 鏍￠獙閲囪喘鍏ュ簱鍗曞瓨鍦ㄤ笖琛屾暟鎹彲缂栬緫锛堜粎鑽夌锛�
+ *
+ * @param id 缂栧彿
+ * @return 閲囪喘鍏ュ簱鍗�
+ */
+ MesWmItemReceiptDO validateItemReceiptLineEditable(Long id);
/**
* 鏌ヨ鎸囧畾渚涘簲鍟嗙殑閲囪喘鍏ュ簱鍗曟暟閲�
@@ -124,4 +137,42 @@
return convertMap(getItemReceiptList(ids), MesWmItemReceiptDO::getId);
}
+ /**
+ * 鏍规嵁鍒拌揣閫氱煡鍗曠敓鎴愰噰璐叆搴撳崟
+ *
+ * @param arrivalNoticeId 鍒拌揣閫氱煡鍗曠紪鍙�
+ * @return 鐢熸垚鐨勯噰璐叆搴撳崟缂栧彿
+ */
+ Long generateItemReceiptFromArrivalNotice(Long arrivalNoticeId);
+
+ /**
+ * 鑾峰緱閲囪喘鍏ュ簱鍗曞鎵圭殑瀹℃牳浜虹紪鍙烽泦鍚�
+ *
+ * 渚涘墠绔垽鏂綋鍓嶇櫥褰曠敤鎴锋槸鍚﹀簲灞曠ず銆屽鏍搞�嶆寜閽紱鏈厤缃椂杩斿洖绌洪泦鍚堛��
+ *
+ * @return 瀹℃牳浜虹敤鎴风紪鍙烽泦鍚�
+ */
+ Set<Long> getItemReceiptApproverUserIds();
+
+ /**
+ * 瀹℃牳閲囪喘鍏ュ簱鍗曪紙寰呬笂鏋� 鈫� 寰呮墽琛屽叆搴� / 鑽夌锛�
+ *
+ * 浠呬笟鍔＄紪鐮� item_receipt_approve 閰嶇疆鐨勫鏍镐汉鍙搷浣滐紙澶氫汉鏃舵垨绛撅級锛屼笖浠呭湪寰呬笂鏋剁姸鎬佷笅鍏佽銆�
+ * 瀹℃牳閫氳繃缃负寰呮墽琛屽叆搴擄紱瀹℃牳涓嶉�氳繃蹇呴』濉啓鍘熷洜锛岄��鍥炶崏绋垮彲淇敼鍚庨噸鏂版彁浜ゃ��
+ *
+ * @param id 鍏ュ簱鍗曠紪鍙�
+ * @param pass 鏄惁閫氳繃锛宼rue=閫氳繃 / false=涓嶉�氳繃
+ * @param reviewRemark 瀹℃牳鎰忚锛屽鏍镐笉閫氳繃鏃跺繀濉�
+ */
+ void auditItemReceipt(Long id, Boolean pass, String reviewRemark);
+
+ /**
+ * 瀵煎叆閲囪喘鍏ュ簱鍗�
+ *
+ * @param importList 瀵煎叆鏁版嵁
+ * @param updateSupport 鏄惁鏀寔鏇存柊
+ * @return 瀵煎叆缁撴灉
+ */
+ MesWmItemReceiptImportRespVO importItemReceiptList(List<MesWmItemReceiptImportExcelVO> importList, boolean updateSupport);
+
}
--
Gitblit v1.9.3