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} - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart} + and a.create_time >= #{createTimeStart} - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + and a.create_time DATEADD(DAY, 1, #{createTimeEnd}) 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" - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeStart} + and a.create_time >= #{createTimeStart} - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + and a.create_time DATEADD(DAY, 1, #{createTimeEnd}) and date_format(a.audit_time,'%Y-%m-%d') >= #{auditTimeStart}