From 7d56f8008efa4a8a7f05241fd366ecd33ca9ab40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com>
Date: Fri, 5 Jun 2026 16:23:40 +0800
Subject: [PATCH] =?UTF-8?q?oms=E4=BB=93=E5=82=A8=E9=A2=84=E7=BA=A6?=
 =?UTF-8?q?=E5=8D=95=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ReserveStockInOrderApplicationService.java | 28 -------------------
 .../ReserveStockInOrderMapper.xml             |  4 +--
 .../ReserveStockOutOrderMapper.xml            |  4 +--
 3 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
index 5fbb699b4..c6a221390 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
@@ -137,34 +137,6 @@ public class ReserveStockInOrderApplicationService {
             }
         }
 
-        // 库管角色过滤：不展示已创建（status=1）的入库单
-        // 说明：部分场景下角色码可能不在 userPo.roleCode 中，而在 loginUser.roles/roleList 中。
-//        if (loginUser != null) {
-//            String targetRoleCode = "KGY-001";
-//            boolean isKuGuan = false;
-//
-//            String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null;
-//            if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) {
-//                isKuGuan = true;
-//            }
-//
-//            if (!isKuGuan && loginUser.getRoleList() != null) {
-//                isKuGuan = loginUser.getRoleList().stream()
-//                        .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
-//            }
-//
-//            if (!isKuGuan && loginUser.getRoles() != null) {
-//                isKuGuan = loginUser.getRoles().stream()
-//                        .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
-//            }
-//
-//            if (isKuGuan) {
-//                Integer currentGtStatus = stockInOrderDO.getGtStatus();
-//                if (currentGtStatus == null || currentGtStatus < 1) {
-//                    stockInOrderDO.setGtStatus(1); // status > 1
-//                }
-//            }
-//        }
         return stockInOrderDomainService.queryList(stockInOrderDO);
     }
 
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
index 5f1ec24c9..b04c68208 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
@@ -418,10 +418,10 @@
             and a.issue_status = #{issueStatus}
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+            and a.create_time >= #{createTimeStart}
         </if>
         <if test="createTimeEnd != null and createTimeEnd != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+            and a.create_time <![CDATA[ < ]]> DATEADD(DAY, 1, #{createTimeEnd})
         </if>
         <!-- 入库明细：物料名称、物料编码（同一明细行同时满足；与计划数量汇总口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
         <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
diff --git a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
index 4068c0eba..05fa3137e 100644
--- a/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
@@ -299,10 +299,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </foreach>
         </if>
         <if test="createTimeStart != null and createTimeStart != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &gt;= #{createTimeStart}
+            and a.create_time >= #{createTimeStart}
         </if>
         <if test="createTimeEnd != null and createTimeEnd != ''">
-            and date_format(a.create_time,'%Y-%m-%d') &lt;= #{createTimeEnd}
+            and a.create_time <![CDATA[ < ]]> DATEADD(DAY, 1, #{createTimeEnd})
         </if>
         <if test="auditTimeStart != null and auditTimeStart != ''">
             and date_format(a.audit_time,'%Y-%m-%d') &gt;= #{auditTimeStart}