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/arrivalnotice/MesWmArrivalNoticeService.java |   22 +++++++++++++++++++++-
 1 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
index aaea87d..ca34c76 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeService.java
@@ -1,6 +1,8 @@
 package cn.iocoder.yudao.module.mes.service.wm.arrivalnotice;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeImportRespVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticePageReqVO;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
@@ -57,6 +59,15 @@
     PageResult<MesWmArrivalNoticeDO> getArrivalNoticePage(MesWmArrivalNoticePageReqVO pageReqVO);
 
     /**
+     * 瀵煎叆鍒拌揣閫氱煡鍗�
+     *
+     * @param importList    瀵煎叆鐨勫埌璐ч�氱煡鍗曞垪琛�
+     * @param updateSupport 鏄惁鏀寔鏇存柊锛堝凡瀛樺湪鐨勭紪鐮佷粎鍦ㄨ崏绋跨姸鎬佹椂鍏佽瑕嗙洊鏇存柊锛�
+     * @return 瀵煎叆缁撴灉
+     */
+    MesWmArrivalNoticeImportRespVO importArrivalNoticeList(List<MesWmArrivalNoticeImportExcelVO> importList, boolean updateSupport);
+
+    /**
      * 鎻愪氦鍒拌揣閫氱煡鍗曪紙鑽夌 鈫� 寰呰川妫�/寰呭叆搴擄級
      *
      * @param id 缂栧彿
@@ -69,9 +80,10 @@
      * @param id 鍒拌揣閫氱煡鍗曠紪鍙�
      * @param lineId 鍒拌揣閫氱煡鍗曡缂栧彿
      * @param iqcId IQC 妫�楠屽崟缂栧彿
+     * @param checkResult 璐ㄦ缁撴灉锛�1鍚堟牸 2鐗归噰 3涓嶅悎鏍奸��璐� 4涓嶅悎鏍兼姤搴燂級
      * @param qualifiedQuantity 鍚堟牸鏁伴噺
      */
-    void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, BigDecimal qualifiedQuantity);
+    void updateArrivalNoticeWhenIqcFinish(Long id, Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity);
 
     /**
      * 瀹屾垚鍒拌揣閫氱煡鍗曪紙寰呭叆搴� 鈫� 宸插畬鎴愶級锛屽唴閮ㄨ皟鐢�
@@ -133,4 +145,12 @@
      */
     Long getArrivalNoticeCountByVendorId(Long vendorId);
 
+    /**
+     * 鏍规嵁閲囪喘璁㈠崟鐢熸垚鍒拌揣閫氱煡鍗�
+     *
+     * @param purchaseOrderId 閲囪喘璁㈠崟缂栧彿
+     * @return 鐢熸垚鐨勫埌璐ч�氱煡鍗曠紪鍙�
+     */
+    Long generateArrivalNoticeFromPurchaseOrder(Long purchaseOrderId);
+
 }

--
Gitblit v1.9.3