fix: 代码审查问题修复与优化

## 高优先级修复

1. **导出功能完善** (reagent_orders.py)
   - 导出CSV时查询并填充申请人姓名

2. **添加缓存机制** (reagent_orders.py)
   - 新增 REAGENT_ORDER_CACHE 缓存查询结果
   - 与 inventory.py 保持一致的缓存策略

3. **前后端验证统一**
   - ReagentOrderCreate.price 改为必填 (gt=0)
   - 前端 validationSchemas.ts price 使用 createPriceSchema(0.01)
   - 删除前端无效的 supplier 字段

## 中等优先级修复

4. **创建通用用户查询函数** (user_utils.py)
   - 新增 batch_get_user_names() 消除 N+1 查询
   - reagent_orders.py、consumable_orders.py、inventory.py 统一使用

5. **规格验证正则修复** (spec_utils.py)
   - 修复正则表达式避免匹配 "1.5.5" 等非法格式

6. **ConsumableOrder 字段统一**
   - 改为 initial_quantity + unit 存储，与 ReagentOrder 一致
   - 后端自动解析 specification 字符串

7. **前端 API 类型完善** (client.ts)
   - 添加 ReagentOrderStatus、ConsumableOrderStatus 枚举
   - status_filter 参数使用枚举类型

Author: hzb666

.claude/GIT_STRATEGY.md

@@ -24,6 +24,7 @@ env/
 !.vscode/extensions.json
 .idea/
 .cursor/
+.github/
 .history/
 .claude/
 .kilocode/
@@ -58,3 +59,13 @@ dist/
 
 # Template/External projects (do not commit)
 shadcn-admin/
+
+
+# Local library files
+frontend/public/lib/
+
+# Docs subdirectories (keep root docs)
+docs/done/
+docs/exp/
+docs/plans/
+docs/prompt/

.claude/Rules.md

@@ -20,10 +20,20 @@
 )
 from app.models.user import User
 from app.services.image_service import process_uploaded_image
+from app.services.spec_utils import parse_specification, SpecificationError, format_specification
+from app.services.user_utils import batch_get_user_names
 
 router = APIRouter(prefix="/consumable-orders", tags=["ConsumableOrders"])
 
 
+def _add_specification(item_dict: dict) -> dict:
+    """Add computed specification field to order response dict"""
+    initial = item_dict.get("initial_quantity", 0)
+    unit = item_dict.get("unit", "")
+    item_dict["specification"] = format_specification(initial, unit)
+    return item_dict
+
+
 def get_consumable_order_by_id(db: Session, order_id: int) -> Optional[ConsumableOrder]:
     """Get consumable order by ID"""
     return db.get(ConsumableOrder, order_id)
@@ -36,14 +46,24 @@ def create_consumable_order(
     db: Session = Depends(get_db)
 ):
     """Create a new consumable order"""
+    # Parse specification to get initial_quantity and unit
+    try:
+        initial_quantity, unit = parse_specification(order.specification)
+    except SpecificationError as e:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=f"Invalid specification format: {e}"
+        )
+
     # Create order
     db_order = ConsumableOrder(
         name=order.name,
         english_name=order.english_name,
         alias=order.alias,
         category=order.category,
         brand=order.brand,
-        specification=order.specification,
+        initial_quantity=initial_quantity,
+        unit=unit,
         quantity=order.quantity,
         price=order.price,
         order_reason=order.order_reason,
@@ -111,15 +131,11 @@ def list_consumable_orders(
 
     # Enrich with applicant names
     applicant_ids = {o.applicant_id for o in orders if o.applicant_id}
-    users_map: dict[int, str] = {}
-    if applicant_ids:
-        from app.models.user import User as UserModel
-        users = db.exec(select(UserModel).where(UserModel.id.in_(applicant_ids))).all()
-        users_map = {u.id: u.full_name or u.username for u in users}
+    users_map = batch_get_user_names(db, applicant_ids)
 
     return {
         "data": [
-            {**ConsumableOrderResponse.model_validate(o).model_dump(), "applicant_name": users_map.get(o.applicant_id, "")}
+            _add_specification({**ConsumableOrderResponse.model_validate(o).model_dump(), "applicant_name": users_map.get(o.applicant_id, "")})
             for o in orders
         ],
         "total": total,
@@ -287,7 +303,7 @@ def get_my_consumable_orders(
             "order_id": order.id,
             "name": order.name,
             "english_name": order.english_name,
-            "specification": order.specification,
+            "specification": format_specification(order.initial_quantity, order.unit),
             "quantity": order.quantity,
             "price": order.price,
             "is_hazardous": order.is_hazardous,

.gitignore

@@ -33,8 +33,9 @@
 from app.core.time_utils import get_utc_now
 from app.services.cas_utils import normalize_cas
 from app.services.internal_code import generate_internal_code
-from app.services.spec_utils import parse_specification, SpecificationError
+from app.services.spec_utils import parse_specification, SpecificationError, format_specification
 from app.services.pinyin_utils import compute_pinyin_fields
+from app.services.user_utils import batch_get_user_names
 
 logger = logging.getLogger(__name__)
 
@@ -127,7 +128,7 @@ def validate_uploaded_file(file: UploadFile) -> None:
 # ==================== Search Cache ====================
 # 简单内存缓存，用于减少重复搜索查询
 SEARCH_CACHE: Dict[str, tuple[Any, datetime]] = {}
-CACHE_TTL_SECONDS = 60  # 缓存有效期60秒
+CACHE_TTL_SECONDS = 10  # 缓存有效期10秒，与前端refetchInterval匹配
 
 
 def _get_cached_result(cache_key: str) -> Optional[Dict[str, Any]]:
@@ -225,14 +226,7 @@ def _add_specification(item_dict: dict) -> dict:
     """Add computed specification field to inventory response dict"""
     initial = item_dict.get("initial_quantity", 0)
     unit = item_dict.get("unit", "")
-    # Format: "500 ml" or "250.5 ml" (no trailing zeros, space between number and unit)
-    if initial == int(initial):
-        # No decimal part, show as integer
-        formatted = f"{int(initial)} {unit}"
-    else:
-        # Has decimal part, keep the decimal without trailing zeros
-        formatted = f"{float(initial)} {unit}"
-    item_dict["specification"] = formatted if initial else None
+    item_dict["specification"] = format_specification(initial, unit)
     return item_dict
 
 
@@ -602,7 +596,7 @@ def import_inventory(
 @router.get("/")
 def list_inventory(
     skip: int = 0,
-    limit: int = 0,  # 0 表示不分页，返回全部数据
+    limit: int = 50,  # 默认分页50条，与前端保持一致
     status_filter: Optional[InventoryStatus] = None,
     cas_filter: Optional[str] = None,
     hazardous_only: bool = False,
@@ -617,8 +611,13 @@ def list_inventory(
     # 生成缓存key（包含所有搜索参数，包括分页和排序）
     cache_key = f"list:{skip}:{limit}:{search or ''}:{status_filter or ''}:{cas_filter or ''}:{hazardous_only}:{search_field or ''}:{fuzzy}:{sort_by or ''}:{sort_order or ''}"
 
-    # 尝试从缓存获取（仅当是不分页查询或第一页时）
-    if limit == 0 or skip == 0:
+    # 尝试从缓存获取（仅当是第一页且无搜索条件时）
+    # 这样可以避免分页数据不一致的问题
+    is_first_page = skip == 0
+    has_search = bool(search or status_filter or cas_filter or hazardous_only or sort_by)
+    should_use_cache = is_first_page and not has_search
+    
+    if should_use_cache:
         cached = _get_cached_result(cache_key)
         if cached is not None:
             # 返回缓存结果，但更新分页参数
@@ -775,12 +774,8 @@ def norm_field(field):
         if item.created_by_id:
             user_ids.add(item.created_by_id)
 
-    # 用一条 SQL IN 语句，一次性查出这 50 条数据对应的所有用户
-    users_map = {}
-    if user_ids:
-        users = db.exec(select(User).where(User.id.in_(user_ids))).all()
-        # 构建内存字典 { user_id: "姓名" }，查找速度是 O(1)
-        users_map = {u.id: (u.full_name or u.username) for u in users}
+    # 使用通用函数批量查询用户姓名
+    users_map = batch_get_user_names(db, user_ids)
 
     # 在内存中完成数据组装，绝不再向数据库发请求
     result_data = []
@@ -804,8 +799,8 @@ def norm_field(field):
         "limit": limit,
     }
 
-    # 缓存查询结果（不分页或第一页时缓存）
-    if limit == 0 or skip == 0:
+    # 缓存查询结果（仅当是第一页且无搜索条件时）
+    if should_use_cache:
         # 缓存时不包含分页参数
         cache_data = {
             "data": result["data"],