From bb66a767626d192a61281e34ae7d86e6d626953f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Mon, 18 May 2026 10:26:32 +0800
Subject: [PATCH] =?UTF-8?q?oms=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../MaterialInventoryMapper.xml | 6 ++++
.../ReservationStockInOrderMapper.xml | 3 ++
.../ReservationStockOutOrderMapper.xml | 3 ++
.../ReserveStockInOrderMapper.xml | 31 ++++++++++++++++---
.../ReserveStockOutOrderMapper.xml | 6 ++++
5 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
index 5118ae68b..ce0ef0797 100644
--- a/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationMaterialInventory/MaterialInventoryMapper.xml
@@ -157,6 +157,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.material_inventory_id = #{materialInventoryId}
+
+ and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
+
+
+ and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd}
+
and a.organization_id = #{organizationId}
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
index aec6f074a..6b4d3243b 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml
@@ -244,6 +244,9 @@
and a.audit_time = #{auditTime}
+
+ and a.issue_status = #{issueStatus}
+
and a.warehouse_id = #{warehouseId}
diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
index 6f9ca0010..ba129dc04 100644
--- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml
@@ -178,6 +178,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.check_task_distribution = #{checkTaskDistribution}
+
+ and a.issue_status = #{issueStatus}
+
and a.audit_by = #{auditBy}
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
index 0c1fdec26..5c4dffa83 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
@@ -410,6 +410,12 @@
and a.ORDER_DATE = #{orderDate}
+
+ and a.business_order_no = #{businessOrderNo}
+
+
+ and a.issue_status = #{issueStatus}
+
and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart}
@@ -647,19 +653,34 @@
) as a
where 1=1
- and a.organization_id = #{organizationId}
+ and a."organizationId" = #{organizationId}
- and a.top_organization_id = #{topOrganizationId}
+ and a."topOrganizationId" = #{topOrganizationId}
- and a.warehouse_id = #{warehouseId}
+ and a."warehouseId" = #{warehouseId}
- and a.shipper_id = #{shipperId}
+ and a."shipperId" = #{shipperId}
- and a.customer_id = #{customerId}
+ and a."customerId" = #{customerId}
+
+
+ and a."inOrOut" = #{inOrOut}
+
+
+ and a."issueStatus" = #{issueStatus}
+
+
+ and a."orderNumber" = #{orderNumber}
+
+
+ and date_format(a."createTime",'%Y-%m-%d') >= #{createTimeStart}
+
+
+ and date_format(a."createTime",'%Y-%m-%d') <= #{createTimeEnd}
order by a."createTime" desc
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
index ecc8d3e57..b4f650624 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
@@ -277,6 +277,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.check_status < #{ltCheckStatus}
+
+ and a.business_order_no = #{businessOrderNo}
+
+
+ and a.issue_status = #{issueStatus}
+
and a.create_by_name like concat('%', #{createByName}, '%')