Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

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.in("mc.material_type", Arrays.asList("成品", "原料"));
         // 处理仓库ID查询，支持递归查询子节点
         if (bo.getActualWarehouseId() != null) {
             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.like(StringUtils.isNotBlank(bo.getBatchNo()), "mc.enter_coil_no", bo.getBatchNo());
 
+
         // 使用 groupBy 进行分组
         qw.groupBy(
                 "mc.actual_warehouse_id",