weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oms仓储预约单按创建时间查询修改;

Browse Source
This commit is contained in:
王奎兴
2026-06-05 16:23:40 +08:00
parent be00edc7b2
commit 7d56f8008e
3 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java
-28
View File
@@ -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);
}
mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml
+2 -2
View File
@@ -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 != '')">
mhd_oms/src/main/resources/mapper/reserveStockOutOrder/ReserveStockOutOrderMapper.xml
+2 -2
View File
@@ -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}