From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
index d3a7a25..196b777 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java
@@ -37,8 +37,10 @@
.eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
.eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
.eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
- wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
- .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
+ if (!Boolean.TRUE.equals(reqVO.getIncludeZero())) {
+ wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO);
+ }
+ wrapper.orderByAsc(MesWmMaterialStockDO::getReceiptTime);
// 铏氭嫙浠撹繃婊わ紙Service 灞傚凡灏� virtualFilter 瑙ｆ瀽涓� virtualWarehouseId锛�
if (virtualWarehouseId != null) {
if (MesWmMaterialStockPageReqVO.VIRTUAL_FILTER_ONLY.equals(reqVO.getVirtualFilter())) {
@@ -162,8 +164,8 @@
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eq(MesWmMaterialStockDO::getItemId, itemId)
.eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
- .eq(MesWmMaterialStockDO::getLocationId, locationId)
- .eq(MesWmMaterialStockDO::getAreaId, areaId)
+ .eqIfPresent(MesWmMaterialStockDO::getLocationId, locationId)
+ .eqIfPresent(MesWmMaterialStockDO::getAreaId, areaId)
.eq(MesWmMaterialStockDO::getStockState, MesWmStockStateEnum.QUALIFIED.getState());
// batchId=null 鏃剁簿纭尮閰� is null
if (batchId != null) {
@@ -186,8 +188,8 @@
LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
.eq(MesWmMaterialStockDO::getItemId, itemId)
.eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
- .eq(MesWmMaterialStockDO::getLocationId, locationId)
- .eq(MesWmMaterialStockDO::getAreaId, areaId)
+ .eqIfPresent(MesWmMaterialStockDO::getLocationId, locationId)
+ .eqIfPresent(MesWmMaterialStockDO::getAreaId, areaId)
.eq(MesWmMaterialStockDO::getStockState, MesWmStockStateEnum.QUALIFIED.getState());
// batchId=null 鏃剁簿纭尮閰� is null
if (batchId != null) {
--
Gitblit v1.9.3