From 0be73e9bfeb7e56cc6bc6ba7fd2137bdb7c2202e Mon Sep 17 00:00:00 2001
From: rcx <3084692334@qq.com>
Date: Wed, 26 Aug 2026 15:49:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(oms):=20=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E8=81=94=E5=90=88=E5=88=97=E8=A1=A8(inAndOutList)=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E5=A4=8D=E4=B8=8E=E8=A1=A5?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复 ReflectionException：mapper XML <if> 引用 inOrOut/orderNumber 但 DO 无对应字段，
   DO/DTO 新增 inOrOut、orderNumber 查询字段（BeanUtils 同名自动拷贝，前端参数直达 mapper）
2. inOrOut 排除空串与 'all'（前端"全部"约定值），避免拼出 ="all" 查空
3. orderNumber 排除空串并改为 like 模糊匹配（与出库单列表单号搜索口径一致）
4. status 新增精确筛选（0 为有效条件值，按前端约定直传，"全部"时不传）
---
 .../repository/todo/ReserveStockInOrderDO.java        |  6 ++++++
 .../repository/todo/ReserveStockInOrderDTO.java       |  6 ++++++
 .../reserveStockInOrder/ReserveStockInOrderMapper.xml | 11 +++++++----
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
index 39fef8510..6346fc9d7 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDO.java
@@ -446,4 +446,10 @@ public class ReserveStockInOrderDO extends BaseVOEntity {
     @ApiModelProperty("客户名称")
     @Excel(name = "客户名称")
     private String customerName;
+
+    @ApiModelProperty("出入库方向（inAndOutList查询条件）: in-入库 out-出库 all/空-全部")
+    private String inOrOut;
+
+    @ApiModelProperty("出入库单号（inAndOutList查询条件，模糊匹配，出库out_order_number/入库in_order_number）")
+    private String orderNumber;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
index 8e24361b6..92b59c131 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/todo/ReserveStockInOrderDTO.java
@@ -443,4 +443,10 @@ public class ReserveStockInOrderDTO extends ReserveStockInOrderBaseDTO {
     @ApiModelProperty("客户名称")
     @Excel(name = "客户名称")
     private String customerName;
+
+    @ApiModelProperty("出入库方向（inAndOutList查询条件）: in-入库 out-出库 all/空-全部")
+    private String inOrOut;
+
+    @ApiModelProperty("出入库单号（inAndOutList查询条件，模糊匹配，出库out_order_number/入库in_order_number）")
+    private String orderNumber;
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
index c7f95902f..ce164c569 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
@@ -558,7 +558,7 @@
     </resultMap>
 
     <select id="detailsList" parameterType="com.mhd.oms.domain.reserveStockInOrder.repository.todo.ReserveStockInOrderDO" resultMap="MaterialDetailResult">
-        select b.*
+        select b.*, a.status, a.issue_status
         from reserve_stock_in_order a left join reserve_in_material_detail b on a.IN_ORDER_NUMBER = b.IN_ORDER_NUMBER
         <where>
             <include refid="selectStockInOrderPo1"/>
@@ -671,14 +671,17 @@
         <if test="customerId != null">
             and a."customerId" = #{customerId}
         </if>
-        <if test="inOrOut != null">
+        <if test="inOrOut != null and inOrOut != '' and inOrOut != 'all'">
             and a."inOrOut" = #{inOrOut}
         </if>
+        <if test="status != null">
+            and a."status" = #{status}
+        </if>
         <if test="issueStatus != null">
             and a."issueStatus" = #{issueStatus}
         </if>
-        <if test="orderNumber != null">
-            and a."orderNumber" = #{orderNumber}
+        <if test="orderNumber != null and orderNumber != ''">
+            and a."orderNumber" like concat('%', #{orderNumber}, '%')
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
             and date_format(a."createTime",'%Y-%m-%d') &gt;= #{createTimeStart}