From 29b9cad2d03bbcbf4b055ac897a54c0c5be75327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Fri, 27 Mar 2026 16:57:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(out-assistance):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8F=B7=E6=90=9C=E7=B4=A2=E5=92=8CID?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在OutAssistanceSearchQO中新增matnr物料号字段和ids列表字段
- 添加@JsonIgnore注解忽略ids字段的序列化
- 在WmsOutAssistanceMapper.xml中实现ids条件查询逻辑
- 当ids为空时设置条件为false，非空时进行in查询
- 在WmsOutAssistanceServiceImpl中实现物料号搜索功能
- 通过物料号关联查询对应的订单ID列表进行过滤
- 使用StrUtil工具类进行字符串非空判断
---
 .../wms/common/pojo/qo/OutAssistanceSearchQO.java | 11 +++++++++++
 .../service/impl/WmsOutAssistanceServiceImpl.java | 15 +++++++++++++++
 .../resources/mapper/WmsOutAssistanceMapper.xml   | 11 +++++++++++
 3 files changed, 37 insertions(+)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java
index df4baf30..a37709e5 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutAssistanceSearchQO.java
@@ -1,7 +1,10 @@
 package com.nflg.wms.common.pojo.qo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class OutAssistanceSearchQO extends SearchBaseQO {
 
@@ -24,4 +27,12 @@ public class OutAssistanceSearchQO extends SearchBaseQO {
      * 供应商
      */
     private String lifnr;
+
+    /**
+     * 物料号
+     */
+    private String matnr;
+
+    @JsonIgnore
+    private List<Long> ids;
 }
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java
index 2826f03b..b3da7077 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsOutAssistanceServiceImpl.java
@@ -1,10 +1,12 @@
 package com.nflg.wms.repository.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.nflg.wms.common.pojo.qo.OutAssistanceSearchQO;
 import com.nflg.wms.repository.entity.WmsOutAssistance;
+import com.nflg.wms.repository.entity.WmsOutAssistanceItem;
 import com.nflg.wms.repository.mapper.WmsOutAssistanceMapper;
 import com.nflg.wms.repository.service.IWmsOutAssistanceItemService;
 import com.nflg.wms.repository.service.IWmsOutAssistanceService;
@@ -26,6 +28,19 @@ public class WmsOutAssistanceServiceImpl extends ServiceImpl<WmsOutAssistanceMap
 
     @Override
     public IPage<WmsOutAssistance> search(OutAssistanceSearchQO request) {
+        if (StrUtil.isNotBlank(request.getMatnr())) {
+            request.setIds(
+                    wmsOutAssistanceItemService.lambdaQuery()
+                            .like(WmsOutAssistanceItem::getMatnr, request.getMatnr())
+                            .or()
+                            .like(WmsOutAssistanceItem::getMatnr1, request.getMatnr())
+                            .list()
+                            .stream()
+                            .map(WmsOutAssistanceItem::getOrderId)
+                            .toList()
+            );
+        }
+
         return baseMapper.search(request, new Page<>(request.getPage(), request.getPageSize()));
     }
 }
diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml
index 76e276eb..251e2378 100644
--- a/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/WmsOutAssistanceMapper.xml
@@ -6,6 +6,17 @@
         SELECT *
         FROM wms_out_assistance
         <where>
+            <if test="request.ids != null">
+                <if test="request.ids.isEmpty()">
+                    and 1=2
+                </if>
+                <if test="!request.ids.isEmpty()">
+                    and id in
+                    <foreach item="item" collection="request.ids" separator="," open="(" close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
             <if test="request.no != null and request.no!=''">
                 AND "no" ilike CONCAT('%', #{request.no}, '%')
             </if>