diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java index da5553d9..d97e70cb 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsStockServiceImpl.java @@ -68,7 +68,8 @@ public class WmsStockServiceImpl implements IWmsStockService { // 固定条件:未删除的现存数据 qw.eq("mc.del_flag", 0); qw.eq("mc.data_type", 1); - + qw.eq("mc.status", 0); + qw.eq("mc.material_type", "成品").or().eq("mc.product_type", "原料"); // 处理仓库ID查询,支持递归查询子节点 if (bo.getActualWarehouseId() != null) { List warehouseIds = getActualWarehouseIdsWithChildren(bo.getActualWarehouseId()); @@ -82,6 +83,7 @@ public class WmsStockServiceImpl implements IWmsStockService { qw.eq(bo.getItemId() != null, "mc.item_id", bo.getItemId()); qw.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo()); + // 使用 groupBy 进行分组 qw.groupBy( "mc.actual_warehouse_id",