修复错误
This commit is contained in:
@@ -68,7 +68,8 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|||||||
// 固定条件:未删除的现存数据
|
// 固定条件:未删除的现存数据
|
||||||
qw.eq("mc.del_flag", 0);
|
qw.eq("mc.del_flag", 0);
|
||||||
qw.eq("mc.data_type", 1);
|
qw.eq("mc.data_type", 1);
|
||||||
|
qw.eq("mc.status", 0);
|
||||||
|
qw.eq("mc.material_type", "成品").or().eq("mc.product_type", "原料");
|
||||||
// 处理仓库ID查询,支持递归查询子节点
|
// 处理仓库ID查询,支持递归查询子节点
|
||||||
if (bo.getActualWarehouseId() != null) {
|
if (bo.getActualWarehouseId() != null) {
|
||||||
List<Long> warehouseIds = getActualWarehouseIdsWithChildren(bo.getActualWarehouseId());
|
List<Long> warehouseIds = getActualWarehouseIdsWithChildren(bo.getActualWarehouseId());
|
||||||
@@ -82,6 +83,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|||||||
qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId());
|
qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId());
|
||||||
qw.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo());
|
qw.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo());
|
||||||
|
|
||||||
|
|
||||||
// 使用 groupBy 进行分组
|
// 使用 groupBy 进行分组
|
||||||
qw.groupBy(
|
qw.groupBy(
|
||||||
"mc.actual_warehouse_id",
|
"mc.actual_warehouse_id",
|
||||||
|
|||||||
Reference in New Issue
Block a user