feat(client): 入库/出库加搜索框，入库/出库/库存加刷新按钮

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx

CHANGELOG-client.md

@@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.64] - 2026-06-20
+
+### 新功能
+- 入库单 / 出库单列表新增搜索框：输入单号或往来单位名称即可即时筛选，不用再翻页查找
+- 入库 / 出库 / 库存三个列表均新增刷新按钮：多端并发录入后可一键同步最新数据
+
+## [1.0.63] - 2026-06-20
+
+### 修复
+- 修复入库单 / 出库单「全部状态」筛选遗漏未审核单据的问题，状态下拉新增「待审核」选项，且筛选真正生效
+- 修复「入库审核 / 出库审核」标签页只显示部分待审核单、漏掉早期单号的问题：筛选改为服务端驱动，跨分页结果完整可靠
+
+## [1.0.62] - 2026-06-20
+
+### 改进
+- 入库单、出库单的仓库、供应商、客户下拉框改为可搜索：点击后弹出搜索框，支持按名称、拼音首字母或编码快速筛选，选项多时无需再逐条翻找
+
+### 修复
+- 修复账号在别处登录或被管理员强制下线后、退回登录页却没有任何提示的问题，现在会弹窗明确告知「登录已失效」
+
 ## [1.0.61] - 2026-06-20
 
 ### 改进

CHANGELOG-server.md

@@ -5,6 +5,31 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.67] - 2026-06-20
+
+### 修复
+- 历史导入单审核入库后，库存里商品显示为「历史导入占位」、按真实名搜不到的问题：审核生成库存时改用单据明细自带的真实商品名/编码/系列/规格，库存列表也不再显示已删除的占位商品名
+- 库存列表按真实商品名/编码即可搜到这些历史商品
+
+### 新功能
+- 入库单 / 出库单列表支持关键词搜索：按单号或往来单位名称即时筛选
+
+## [1.0.66] - 2026-06-20
+
+### 修复
+- 入库/出库单据列表改为按业务日期（入库/出库日期）倒序排列：从旧系统迁入的历史单据按真实日期归位到列表顶部，不再因录入时间晚、被排到末尾分页而在首页遗漏
+
+## [1.0.65] - 2026-06-20
+
+### 修复
+- 单据列表状态筛选支持一次查询多种状态，配合客户端修复让「入库审核 / 出库审核」标签页完整列出全部待审核单据，不再因分页只显示部分
+
+## [1.0.64] - 2026-06-20
+
+### 改进
+- 登录设备并发限制改为「按账号统计全部平台合计」：同一账号在桌面、移动、Web 各端加起来最多同时在线 5 台设备（原先各平台分别计数）
+- 达到设备上限时，新设备登录会被明确拒绝并提示「已达到登录设备上限，请提升额度或下线其他设备后重试」，不再静默把最早登录的设备顶下线——由用户自行决定下线哪台或提升额度
+
 ## [1.0.63] - 2026-06-20
 
 ### 新功能

backend/config/config.go

@@ -36,9 +36,10 @@ type JWTConfig struct {
 
 // SessionConfig 登录会话与并发限制（全局默认，可被每店 session_policy 覆盖）。
 type SessionConfig struct {
-	LimitDesktop  int `mapstructure:"limit_desktop"`   // 桌面端(win/mac/linux)最大并发会话，0=禁止
-	LimitMobile   int `mapstructure:"limit_mobile"`    // 移动端(android/ios)最大并发会话，0=禁止
-	LimitWeb      int `mapstructure:"limit_web"`       // web 端最大并发会话，0=禁止
+	LimitTotal    int `mapstructure:"limit_total"`     // 单用户跨全部平台的最大并发会话总数（超额踢最旧）
+	LimitDesktop  int `mapstructure:"limit_desktop"`   // 桌面端(win/mac/linux)平台闸门，0=禁止该平台登录
+	LimitMobile   int `mapstructure:"limit_mobile"`    // 移动端(android/ios)平台闸门，0=禁止该平台登录
+	LimitWeb      int `mapstructure:"limit_web"`       // web 端平台闸门，0=禁止该平台登录
 	MaxFailures   int `mapstructure:"max_failures"`    // 同一账号连续登录失败几次后锁定
 	IPMaxFailures int `mapstructure:"ip_max_failures"` // 同一 IP 跨账号累计失败几次后锁定该 IP（防单 IP 撞多账号）
 	LockMinutes   int `mapstructure:"lock_minutes"`    // 锁定时长（分钟）
@@ -92,7 +93,8 @@ func Load() {
 	viper.SetDefault("server.cors_origin", "*")
 	viper.SetDefault("jwt.access_expire_min", 60)
 	viper.SetDefault("jwt.refresh_expire_h", 168) // 7天
-	viper.SetDefault("session.limit_desktop", 2)
+	viper.SetDefault("session.limit_total", 5)   // 单用户跨全部平台合计并发上限
+	viper.SetDefault("session.limit_desktop", 2) // 平台闸门：>0=允许，0=禁止该平台（数值不再作分平台上限）
 	viper.SetDefault("session.limit_mobile", 2)
 	viper.SetDefault("session.limit_web", 2) // 默认不禁 web（官网挂着 Web 版 app）；设 0 可禁
 	viper.SetDefault("session.max_failures", 5)

backend/internal/handler/auth.go

@@ -48,6 +48,9 @@ func (h *AuthHandler) Login(c *gin.Context) {
 			status = http.StatusTooManyRequests
 		} else if errors.Is(err, service.ErrPlatformNotAllowed) {
 			status = http.StatusForbidden
+		} else if errors.Is(err, service.ErrDeviceLimitReached) {
+			c.JSON(http.StatusConflict, gin.H{"error": err.Error(), "code": "DEVICE_LIMIT"})
+			return
 		}
 		c.JSON(status, gin.H{"error": err.Error()})
 		return

backend/internal/handler/inventory.go

@@ -68,7 +68,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 	specStr := c.Query("spec")
 
 	if keyword != "" {
-		baseWhere += " AND (COALESCE(NULLIF(p.name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
+		baseWhere += " AND (COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
 		like := "%" + keyword + "%"
 		args = append(args, like, like, like, like)
 	}
@@ -101,7 +101,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		SELECT COUNT(*)
 		FROM inventories inv
 		LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
-		LEFT JOIN products p ON p.id = inv.product_id
+		LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
 		LEFT JOIN warehouses w ON w.id = inv.warehouse_id
 		WHERE ` + baseWhere
 
@@ -116,10 +116,10 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		SELECT
 		  inv.id, inv.shop_id, inv.warehouse_id, inv.product_id, inv.stock_in_item_id,
 		  inv.quantity,
-		  COALESCE(NULLIF(p.code,''), inv.product_code, '') AS product_code,
-		  COALESCE(NULLIF(p.name,''), inv.product_name, '') AS product_name,
-		  COALESCE(NULLIF(p.series,''), inv.series, '') AS series,
-		  COALESCE(NULLIF(p.spec,''), inv.spec, '') AS spec,
+		  COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code, '') AS product_code,
+		  COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name, '') AS product_name,
+		  COALESCE(NULLIF(p.series,''), NULLIF(sii.series,''), inv.series, '') AS series,
+		  COALESCE(NULLIF(p.spec,''), NULLIF(sii.spec,''), inv.spec, '') AS spec,
 		  COALESCE(NULLIF(p.unit,''), inv.unit, '') AS unit,
 		  COALESCE(NULLIF(w.name,''), inv.warehouse_name, '') AS warehouse_name,
 		  COALESCE(sii.unit_price, inv.unit_price) AS unit_price,
@@ -132,7 +132,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		  inv.created_at
 		FROM inventories inv
 		LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
-		LEFT JOIN products p ON p.id = inv.product_id
+		LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
 		LEFT JOIN warehouses w ON w.id = inv.warehouse_id
 		WHERE ` + baseWhere + `
 		ORDER BY inv.id DESC

backend/internal/handler/inventory_test.go

@@ -219,6 +219,52 @@ func TestInventoryHandler_List_HotelIsolation(t *testing.T) {
 	assert.Equal(t, float64(0), respB["total"].(float64))
 }
 
+// 库存指向已软删的占位商品时，列表应回退到明细/库存快照真名，
+// 而非占位商品名「历史导入占位」，且能按真名搜索到。
+func TestInventoryHandler_List_DeletedProductFallsBackToSnapshot(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "INV009")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 明细携带真实快照名
+	item := model.StockInItem{
+		ShopID:      shop.ID,
+		ProductID:   placeholder.ID,
+		ProductCode: "ZXZ029751",
+		ProductName: "贵州茅台酒2006",
+		Quantity:    10,
+	}
+	require.NoError(t, db.Create(&item).Error)
+
+	// 库存：product_id 指向占位商品，且 product_name 也是占位名（模拟旧脏数据）
+	require.NoError(t, db.Create(&model.Inventory{
+		ShopID:        shop.ID,
+		WarehouseID:   &warehouse.ID,
+		ProductID:     &placeholder.ID,
+		StockInItemID: &item.ID,
+		ProductName:   "历史导入占位",
+		Quantity:      10,
+	}).Error)
+
+	// 软删占位商品
+	require.NoError(t, db.Delete(&placeholder).Error)
+
+	// 列表：名称应回退到明细快照真名
+	w := makeRequest(r, "GET", "/api/v1/inventory", token, nil)
+	resp := parseResponse(w)
+	require.Equal(t, float64(1), resp["total"].(float64))
+	invItem := resp["data"].([]interface{})[0].(map[string]interface{})
+	assert.Equal(t, "贵州茅台酒2006", invItem["product_name"])
+
+	// 按真名可搜到
+	w = makeRequest(r, "GET", "/api/v1/inventory?keyword=茅台", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+}
+
 func TestInventoryHandler_AfterStockInApprove(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "INV008")

backend/internal/handler/stock_in.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
@@ -40,7 +41,7 @@ func (h *StockInHandler) List(c *gin.Context) {
 		Where("shop_id = ? AND deleted_at IS NULL", shopID)
 
 	if status := c.Query("status"); status != "" {
-		query = query.Where("status = ?", status)
+		query = query.Where("status IN ?", strings.Split(status, ","))
 	}
 	if startDate := c.Query("start_date"); startDate != "" {
 		query = query.Where("order_date >= ?", startDate)
@@ -48,6 +49,13 @@ func (h *StockInHandler) List(c *gin.Context) {
 	if endDate := c.Query("end_date"); endDate != "" {
 		query = query.Where("order_date <= ?", endDate)
 	}
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		query = query.Where(
+			"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
+			like, shopID, like,
+		)
+	}
 
 	var total int64
 	query.Count(&total)
@@ -55,7 +63,7 @@ func (h *StockInHandler) List(c *gin.Context) {
 	orders := make([]model.StockInOrder, 0)
 	query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
 		Offset((page - 1) * pageSize).Limit(pageSize).
-		Order("id DESC").Find(&orders)
+		Order("order_date DESC, id DESC").Find(&orders)
 
 	c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
 }

backend/internal/handler/stock_in_test.go

@@ -308,6 +308,51 @@ func TestStockInHandler_Reject_NotPending(t *testing.T) {
 	assert.Equal(t, http.StatusBadRequest, w.Code)
 }
 
+func TestStockInHandler_List_FilterByKeyword(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "SI011")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	product := testutil.CreateTestProduct(db, shop.ID, "Brandy")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 往来单位：茅台供应商
+	partner := &model.Partner{Code: "P001", Name: "茅台供应商", Type: "supplier"}
+	partner.ShopID = shop.ID
+	require.NoError(t, db.Create(partner).Error)
+
+	// 单据1：挂往来单位
+	w := makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"partner_id":   partner.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 5.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+	order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
+
+	// 单据2：无往来单位
+	w = makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 3.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+
+	// 按往来单位名搜索 → 只命中单据1
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword=茅台", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 按单号搜索 → 只命中单据1
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword="+order1No, token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 无关键词 → 两条都在
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders", token, nil)
+	assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
+}
+
 func TestStockInHandler_List_FilterByStatus(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SI010")
@@ -343,4 +388,9 @@ func TestStockInHandler_List_FilterByStatus(t *testing.T) {
 	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=draft", token, nil)
 	resp = parseResponse(w)
 	assert.Equal(t, float64(1), resp["total"].(float64))
+
+	// 逗号分隔的多状态：pending + draft 应返回两条（审核标签页用法）
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?status=pending,draft", token, nil)
+	resp = parseResponse(w)
+	assert.Equal(t, float64(2), resp["total"].(float64))
 }

backend/internal/handler/stock_out.go

@@ -3,6 +3,7 @@ package handler
 import (
 	"net/http"
 	"strconv"
+	"strings"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
@@ -33,7 +34,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
 		Where("shop_id = ? AND deleted_at IS NULL", shopID)
 
 	if status := c.Query("status"); status != "" {
-		query = query.Where("status = ?", status)
+		query = query.Where("status IN ?", strings.Split(status, ","))
 	}
 	if startDate := c.Query("start_date"); startDate != "" {
 		query = query.Where("order_date >= ?", startDate)
@@ -41,6 +42,13 @@ func (h *StockOutHandler) List(c *gin.Context) {
 	if endDate := c.Query("end_date"); endDate != "" {
 		query = query.Where("order_date <= ?", endDate)
 	}
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		query = query.Where(
+			"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
+			like, shopID, like,
+		)
+	}
 
 	var total int64
 	query.Count(&total)
@@ -48,7 +56,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
 	orders := make([]model.StockOutOrder, 0)
 	query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
 		Offset((page - 1) * pageSize).Limit(pageSize).
-		Order("id DESC").Find(&orders)
+		Order("order_date DESC, id DESC").Find(&orders)
 
 	c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
 }

backend/internal/handler/stock_out_test.go

@@ -133,6 +133,51 @@ func TestStockOutHandler_List(t *testing.T) {
 	assert.Equal(t, float64(2), resp["total"].(float64))
 }
 
+func TestStockOutHandler_List_FilterByKeyword(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "SO011")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	product := testutil.CreateTestProduct(db, shop.ID, "Beer")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 往来单位：海底捞客户
+	partner := &model.Partner{Code: "C001", Name: "海底捞客户", Type: "customer"}
+	partner.ShopID = shop.ID
+	require.NoError(t, db.Create(partner).Error)
+
+	// 单据1：挂往来单位
+	w := makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"partner_id":   partner.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+	order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
+
+	// 单据2：无往来单位
+	w = makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+
+	// 按往来单位名搜索
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword=海底捞", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 按单号搜索
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword="+order1No, token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 无关键词
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders", token, nil)
+	assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
+}
+
 func TestStockOutHandler_Reject(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SO004")

backend/internal/service/auth.go

@@ -22,6 +22,7 @@ var (
 	ErrUserInactive       = errors.New("user is disabled")
 	ErrLicenseLocked      = errors.New("license locked, please renew or contact support")
 	ErrPlatformNotAllowed = errors.New("该平台不允许登录")
+	ErrDeviceLimitReached = errors.New("已达到登录设备上限，请提升额度或下线其他设备后重试")
 	ErrTooManyAttempts    = errors.New("登录失败次数过多，账号已临时锁定，请稍后再试")
 	ErrSessionRevoked     = errors.New("session revoked")
 
@@ -186,32 +187,31 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
 	// 的 lic_exp 带上新试用到期日。
 	s.ensureTrialOnFirstUse(shop.ID)
 
-	// 按平台类限并发：取有效配额，0=禁止该平台，超额则踢最旧会话腾位。
+	// 平台闸门：配额 0=禁止该平台登录（如禁 web）；数值不再作分平台上限，并发统一按总数限。
 	pclass := model.PlatformClass(dev.Platform)
-	quota := s.effectiveQuota(&shop, pclass)
-	if quota <= 0 {
+	if s.effectiveQuota(&shop, pclass) <= 0 {
 		s.recordLoginAttempt(shopCode, username, dev, false, "platform_not_allowed")
 		return nil, nil, ErrPlatformNotAllowed
 	}
+	// 总并发上限：同一用户跨全部平台合计不超过 totalQuota。已满时拒绝本次登录（不再
+	// 静默踢最旧），让用户自行下线其他设备或提升额度。
+	totalQuota := s.effectiveTotalQuota(&shop)
 
 	sid := uuid.New().String()
 	jti := uuid.New().String() // 初始 refresh token jti，后续每次续期轮换
 	now := time.Now()
 	if err := s.db.Transaction(func(tx *gorm.DB) error {
-		// 统计该 user 在该 class 的活跃会话；超额踢最旧
-		var active []model.UserSession
-		if err := tx.Set("gorm:query_option", "FOR UPDATE").
-			Where("shop_id = ? AND user_id = ? AND platform_class = ? AND revoked_at IS NULL",
-				shop.ID, user.ID, pclass).
-			Order("last_seen_at ASC").Find(&active).Error; err != nil {
+		// 统计该 user 全部平台的活跃会话（不分平台类）；已达上限则拒绝
+		var activeCount int64
+		if err := tx.Model(&model.UserSession{}).
+			Set("gorm:query_option", "FOR UPDATE").
+			Where("shop_id = ? AND user_id = ? AND revoked_at IS NULL",
+				shop.ID, user.ID).
+			Count(&activeCount).Error; err != nil {
 			return err
 		}
-		// 需要腾出 (active+1) - quota 个位置
-		for i := 0; i <= len(active)-quota; i++ {
-			if err := tx.Model(&model.UserSession{}).Where("id = ?", active[i].ID).
-				Updates(map[string]interface{}{"revoked_at": now, "revoked_reason": "kicked"}).Error; err != nil {
-				return err
-			}
+		if activeCount >= int64(totalQuota) {
+			return ErrDeviceLimitReached
 		}
 
 		sess := model.UserSession{
@@ -233,6 +233,9 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
 		}
 		return tx.Model(&model.User{}).Where("id = ?", user.ID).Update("last_login_at", now).Error
 	}); err != nil {
+		if errors.Is(err, ErrDeviceLimitReached) {
+			s.recordLoginAttempt(shopCode, username, dev, false, "device_limit")
+		}
 		return nil, nil, err
 	}
 
@@ -264,7 +267,35 @@ func (s *AuthService) recordLoginAttempt(shopCode, username string, dev DeviceIn
 	}
 }
 
-// effectiveQuota 返回某店某平台类的有效并发配额：优先每店 session_policy 覆盖，否则全局默认。
+// effectiveTotalQuota 返回某店「单用户跨全部平台」的有效并发总配额：优先每店
+// session_policy["total"] 覆盖，否则全局默认 config.C.Session.LimitTotal。至少为 1，
+// 避免误配 0 时把所有会话踢光。
+func (s *AuthService) effectiveTotalQuota(shop *model.Shop) int {
+	q := config.C.Session.LimitTotal
+	if shop.CustomFields != nil {
+		if raw, ok := shop.CustomFields["session_policy"]; ok {
+			if policy, ok := raw.(map[string]interface{}); ok {
+				switch n := policy["total"].(type) {
+				case float64:
+					if int(n) > 0 {
+						q = int(n)
+					}
+				case int:
+					if n > 0 {
+						q = n
+					}
+				}
+			}
+		}
+	}
+	if q < 1 {
+		q = 1
+	}
+	return q
+}
+
+// effectiveQuota 返回某店某平台类的平台闸门值：>0=允许该平台，0=禁止。优先每店
+// session_policy 覆盖，否则全局默认。注意：数值大小不再作分平台并发上限（已统一为总数）。
 func (s *AuthService) effectiveQuota(shop *model.Shop, pclass string) int {
 	def := map[string]int{
 		"desktop": config.C.Session.LimitDesktop,

backend/internal/service/session_test.go

@@ -11,9 +11,13 @@ import (
 	"github.com/wangjia/jiu/backend/testutil"
 )
 
-// 同平台类超配额时踢掉最旧会话。
-func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
+// 达到总配额时拒绝新登录（不踢最旧），已有会话保持在线。
+func TestLogin_TotalQuota_RejectsWhenFull(t *testing.T) {
 	db := testutil.SetupTestDB()
+	old := config.C.Session.LimitTotal
+	config.C.Session.LimitTotal = 2
+	defer func() { config.C.Session.LimitTotal = old }()
+
 	shop := testutil.CreateTestShop(db, "SESS01")
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)
@@ -23,38 +27,43 @@ func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
 	require.NoError(t, err)
 	p2, _, err := svc.Login("SESS01", "admin", "password123", dev)
 	require.NoError(t, err)
-	// 配额 2，第 3 次桌面端登录应踢掉最旧（p1）
+	// 总配额 2 已满，第 3 次登录应被拒绝
 	_, _, err = svc.Login("SESS01", "admin", "password123", dev)
-	require.NoError(t, err)
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)
 
-	// 共 2 个未撤销会话
+	// 仍为 2 个未撤销会话，两者都未被踢
 	var active int64
 	db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
 	assert.Equal(t, int64(2), active)
-
-	// p1 的 refresh 应失败（会话被踢）
 	_, err = svc.RefreshTokens(p1.RefreshToken)
-	assert.ErrorIs(t, err, ErrSessionRevoked)
-	// p2 仍可续期
+	assert.NoError(t, err)
 	_, err = svc.RefreshTokens(p2.RefreshToken)
 	assert.NoError(t, err)
 }
 
-// 移动端与桌面端配额互不影响。
-func TestLogin_QuotaIsolatedByClass(t *testing.T) {
+// 总配额跨全部平台合并计数：不同平台类共用一个总上限，满额即拒。
+func TestLogin_TotalQuota_CountsAcrossClasses(t *testing.T) {
 	db := testutil.SetupTestDB()
+	old := config.C.Session.LimitTotal
+	config.C.Session.LimitTotal = 2
+	defer func() { config.C.Session.LimitTotal = old }()
+
 	shop := testutil.CreateTestShop(db, "SESS02")
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)
 
+	// 桌面 + 移动 占满总配额 2
 	_, _, err := svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "windows"})
 	require.NoError(t, err)
 	_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "android"})
 	require.NoError(t, err)
+	// 第三个不同平台（web）应被总配额拒绝
+	_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "web"})
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)
 
 	var active int64
 	db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
-	assert.Equal(t, int64(2), active) // 桌面 1 + 移动 1，都没被踢
+	assert.Equal(t, int64(2), active) // 仅前两个在线
 }
 
 // 配额为 0 的平台拒绝登录（如禁 web）。
@@ -72,24 +81,23 @@ func TestLogin_PlatformDisabled(t *testing.T) {
 	assert.ErrorIs(t, err, ErrPlatformNotAllowed)
 }
 
-// 每店 session_policy 覆盖全局默认。
+// 每店 session_policy["total"] 覆盖全局总配额默认。
 func TestLogin_PerShopPolicyOverride(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SESS04")
-	// 该店限桌面 1
+	// 该店总配额限 1
 	db.Model(&model.Shop{}).Where("id = ?", shop.ID).
-		Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"desktop": float64(1)}})
+		Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"total": float64(1)}})
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)
 
 	p1, _, err := svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
 	require.NoError(t, err)
-	_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
-	require.NoError(t, err)
-
-	// 第 2 次登录应把 p1 踢掉（配额 1）
+	// 总配额 1 已满，第 2 次登录（不同平台）应被拒绝，p1 保持在线
+	_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "android"})
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)
 	_, err = svc.RefreshTokens(p1.RefreshToken)
-	assert.ErrorIs(t, err, ErrSessionRevoked)
+	assert.NoError(t, err)
 }
 
 // 被禁用用户无法用 refresh token 续命（修复历史漏洞）。

backend/internal/service/stock.go

@@ -64,16 +64,26 @@ func (s *StockService) ApproveStockIn(shopID, orderID, reviewerID uint64) error
 				unitPricePtr = &itemCopy.UnitPrice
 			}
 
-			productCode := ""
-			productName := ""
-			series := ""
-			spec := ""
+			// 优先使用明细自带快照列（历史导入单的真实商品信息在此），
+			// Product 关联仅作兜底（普通 UI 录入单的明细快照为空）。
+			productCode := itemCopy.ProductCode
+			productName := itemCopy.ProductName
+			series := itemCopy.Series
+			spec := itemCopy.Spec
 			unit := ""
 			if itemCopy.Product != nil {
-				productCode = itemCopy.Product.Code
-				productName = itemCopy.Product.Name
-				series = itemCopy.Product.Series
-				spec = itemCopy.Product.Spec
+				if productCode == "" {
+					productCode = itemCopy.Product.Code
+				}
+				if productName == "" {
+					productName = itemCopy.Product.Name
+				}
+				if series == "" {
+					series = itemCopy.Product.Series
+				}
+				if spec == "" {
+					spec = itemCopy.Product.Spec
+				}
 				unit = itemCopy.Product.Unit
 			}
 

backend/internal/service/stock_test.go

@@ -65,6 +65,47 @@ func TestStockService_ApproveStockIn_Success(t *testing.T) {
 	assert.Equal(t, float64(10), logs[0].QtyAfter)
 }
 
+// 历史导入单：明细自带真实快照名，product_id 指向占位商品（名「历史导入占位」）。
+// 审核生成的库存应使用明细快照真名，而非占位商品名。
+func TestStockService_ApproveStockIn_PrefersItemSnapshot(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "STOCK009")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+
+	order := model.StockInOrder{
+		TenantBase:  model.TenantBase{ShopID: shop.ID},
+		OrderNo:     "IN20240101000009",
+		WarehouseID: warehouse.ID,
+		OperatorID:  user.ID,
+		Status:      "pending",
+		OrderDate:   model.Date{Time: time.Now()},
+		Items: []model.StockInItem{
+			{
+				ShopID:      shop.ID,
+				ProductID:   placeholder.ID,
+				ProductCode: "ZXZ029751",
+				ProductName: "贵州茅台酒2006",
+				Series:      "茅台",
+				Spec:        "500ml",
+				Quantity:    10,
+			},
+		},
+	}
+	require.NoError(t, db.Create(&order).Error)
+
+	svc := NewStockService(db)
+	require.NoError(t, svc.ApproveStockIn(shop.ID, order.ID, user.ID))
+
+	var inv model.Inventory
+	require.NoError(t, db.Where("shop_id = ? AND product_id = ?", shop.ID, placeholder.ID).First(&inv).Error)
+	assert.Equal(t, "贵州茅台酒2006", inv.ProductName)
+	assert.Equal(t, "ZXZ029751", inv.ProductCode)
+	assert.Equal(t, "茅台", inv.Series)
+	assert.Equal(t, "500ml", inv.Spec)
+}
+
 func TestStockService_ApproveStockIn_NotPending(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "STOCK002")

backend/testutil/setup.go

@@ -28,6 +28,7 @@ func InitConfig() {
 			RefreshExpireH:  168,
 		},
 		Session: config.SessionConfig{
+			LimitTotal:    5,
 			LimitDesktop:  2,
 			LimitMobile:   2,
 			LimitWeb:      2,

client/lib/providers/stock_in_provider.dart

@@ -23,6 +23,7 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
   String _status = '';
   String? _startDate;
   String? _endDate;
+  String _keyword = '';
   PageResult<StockInOrder>? _cache;
 
   @override
@@ -44,6 +45,7 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
           status: _status.isEmpty ? null : _status,
           startDate: _startDate,
           endDate: _endDate,
+          keyword: _keyword.isEmpty ? null : _keyword,
           page: _page,
           pageSize: _pageSize,
         );
@@ -60,6 +62,9 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
     reload();
   }
 
+  /// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
+  String get currentStatus => _status;
+
   void setStatus(String status) {
     _status = status;
     _page = 1;
@@ -73,6 +78,12 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
     reload();
   }
 
+  void setKeyword(String keyword) {
+    _keyword = keyword;
+    _page = 1;
+    reload();
+  }
+
   void reload() {
     state = const AsyncValue.loading();
     _fetch().then((result) {

client/lib/providers/stock_out_provider.dart

@@ -23,6 +23,7 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
   String _status = '';
   String? _startDate;
   String? _endDate;
+  String _keyword = '';
   PageResult<StockOutOrder>? _cache;
 
   @override
@@ -44,6 +45,7 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
           status: _status.isEmpty ? null : _status,
           startDate: _startDate,
           endDate: _endDate,
+          keyword: _keyword.isEmpty ? null : _keyword,
           page: _page,
           pageSize: _pageSize,
         );
@@ -60,6 +62,9 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
     reload();
   }
 
+  /// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
+  String get currentStatus => _status;
+
   void setStatus(String status) {
     _status = status;
     _page = 1;
@@ -73,6 +78,12 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
     reload();
   }
 
+  void setKeyword(String keyword) {
+    _keyword = keyword;
+    _page = 1;
+    reload();
+  }
+
   void reload() {
     state = const AsyncValue.loading();
     _fetch().then((result) {

client/lib/repositories/stock_in_repository.dart

@@ -13,6 +13,7 @@ class StockInRepository {
     String? status,
     String? startDate,
     String? endDate,
+    String? keyword,
     int page = 1,
     int pageSize = 20,
   }) async {
@@ -23,6 +24,7 @@ class StockInRepository {
         if (status != null && status.isNotEmpty) 'status': status,
         if (startDate != null) 'start_date': startDate,
         if (endDate != null) 'end_date': endDate,
+        if (keyword != null && keyword.isNotEmpty) 'keyword': keyword,
       };
       final resp = await _client.get('/stock-in/orders', params: params);
       return PageResult.fromJson(

client/lib/repositories/stock_out_repository.dart

@@ -13,6 +13,7 @@ class StockOutRepository {
     String? status,
     String? startDate,
     String? endDate,
+    String? keyword,
     int page = 1,
     int pageSize = 20,
   }) async {
@@ -23,6 +24,7 @@ class StockOutRepository {
         if (status != null && status.isNotEmpty) 'status': status,
         if (startDate != null) 'start_date': startDate,
         if (endDate != null) 'end_date': endDate,
+        if (keyword != null && keyword.isNotEmpty) 'keyword': keyword,
       };
       final resp = await _client.get('/stock-out/orders', params: params);
       return PageResult.fromJson(

client/lib/screens/auth/login_screen.dart

@@ -94,6 +94,34 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
             Timer(AppConstants.dropdownCloseDelay, _closeUsername);
       }
     });
+    // 处理「进入登录页之前」就已置入的会话失效提示：登出在 login_screen 挂载前就
+    // 设好了 sessionEndedMessageProvider，而 build 里的 ref.listen 只捕获注册之后的
+    // 变化，会漏掉这个既有值 → 之前「被顶下线无提示」的根因。这里在首帧主动读一次。
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final msg = ref.read(sessionEndedMessageProvider);
+      if (msg != null && msg.isNotEmpty) _showSessionEndedDialog(msg);
+    });
+  }
+
+  /// 弹出「登录已失效 / 被强制下线」提示弹窗，并清空 provider 避免重复弹。
+  void _showSessionEndedDialog(String msg) {
+    if (!mounted) return;
+    ref.read(sessionEndedMessageProvider.notifier).state = null;
+    showDialog<void>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        icon: const Icon(Icons.lock_outline, color: AppTheme.danger),
+        title: const Text('登录已失效'),
+        content: Text(msg),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop(),
+            child: const Text('我知道了'),
+          ),
+        ],
+      ),
+    );
   }
 
   Future<void> _loadHistory() async {
@@ -346,14 +374,12 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
 
   @override
   Widget build(BuildContext context) {
-    // 被踢下线 / 会话失效：登出后跳回登录页，弹一次提示并清空
+    // 已在登录页时会话再失效（例如停留在登录页期间后台请求被吊销）：弹窗提示。
+    // 进入登录页之前就置入的既有值由 initState 的首帧读取处理。
     ref.listen<String?>(sessionEndedMessageProvider, (prev, next) {
       if (next != null && next.isNotEmpty) {
         WidgetsBinding.instance.addPostFrameCallback((_) {
-          if (!mounted) return;
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-              content: Text(next), backgroundColor: AppTheme.danger));
-          ref.read(sessionEndedMessageProvider.notifier).state = null;
+          _showSessionEndedDialog(next);
         });
       }
     });

client/lib/screens/inventory/inventory_list_screen.dart

@@ -677,6 +677,13 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
                                 ColumnPrefs.save(_screenId, v);
                               },
                             ),
+                            IconButton(
+                              tooltip: '刷新',
+                              icon: const Icon(Icons.refresh, size: 20),
+                              onPressed: () => ref
+                                  .read(inventoryListProvider.notifier)
+                                  .reload(),
+                            ),
                           ],
                         ),
                       ],
@@ -712,6 +719,13 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
                           ColumnPrefs.save(_screenId, v);
                         },
                       ),
+                      const SizedBox(width: 8),
+                      OutlinedButton.icon(
+                        onPressed: () =>
+                            ref.read(inventoryListProvider.notifier).reload(),
+                        icon: const Icon(Icons.refresh, size: 16),
+                        label: const Text('刷新'),
+                      ),
                       const Spacer(),
                     ],
                   );

client/lib/screens/stock_in/stock_in_form_screen.dart

@@ -604,24 +604,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
                                             const LinearProgressIndicator(),
                                         error: (_, __) => const Text('加载失败'),
                                         data: (warehouses) =>
-                                            DropdownButtonFormField<int>(
-                                          value: _warehouseId,
-                                          hint: const Text('请选择仓库',
-                                              style: TextStyle(fontSize: 13)),
-                                          items: warehouses
-                                              .map((w) => DropdownMenuItem(
-                                                  value: w.id,
-                                                  child: Text(w.name,
-                                                      style: const TextStyle(
-                                                          fontSize: 13))))
+                                            SearchableOptionField(
+                                          options: warehouses
+                                              .map((w) => OptionItem(
+                                                  id: w.id, name: w.name))
                                               .toList(),
+                                          selectedId: _warehouseId,
+                                          hint: '请选择仓库',
+                                          dialogTitle: '选择入库仓库',
+                                          isRequired: true,
                                           onChanged: (v) {
                                             setState(() => _warehouseId = v);
                                             if (v != null) _loadInventory(v);
                                           },
-                                          validator: (v) =>
-                                              v == null ? '不能为空' : null,
-                                          decoration: const InputDecoration(),
                                         ),
                                       ),
                                     ),
@@ -633,22 +628,19 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
                                             const LinearProgressIndicator(),
                                         error: (_, __) => const Text('加载失败'),
                                         data: (result) =>
-                                            DropdownButtonFormField<int>(
-                                          value: _partnerId,
-                                          hint: const Text('请选择供应商',
-                                              style: TextStyle(fontSize: 13)),
-                                          items: result.data
-                                              .map((p) => DropdownMenuItem(
-                                                  value: p.id,
-                                                  child: Text(p.name,
-                                                      style: const TextStyle(
-                                                          fontSize: 13))))
+                                            SearchableOptionField(
+                                          options: result.data
+                                              .map((p) => OptionItem(
+                                                  id: p.id,
+                                                  name: p.name,
+                                                  code: p.code))
                                               .toList(),
+                                          selectedId: _partnerId,
+                                          hint: '请选择供应商',
+                                          dialogTitle: '选择供应商',
+                                          isRequired: true,
                                           onChanged: (v) =>
                                               setState(() => _partnerId = v),
-                                          validator: (v) =>
-                                              v == null ? '不能为空' : null,
-                                          decoration: const InputDecoration(),
                                         ),
                                       ),
                                     ),

client/lib/screens/stock_in/stock_in_list_screen.dart

@@ -39,6 +39,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
   Set<String> _filterWarehouse = {};
   Set<String> _filterSupplier = {};
   Set<String>? _hiddenCols; // null = 尚未载入本地存档（回退到 minWidth 首次默认）
+  final _searchCtrl = TextEditingController();
 
   static const _screenId = 'stock_in_list';
 
@@ -61,8 +62,25 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
     ColumnPrefs.load(_screenId).then((saved) {
       if (saved != null && mounted) setState(() => _hiddenCols = saved);
     });
+    // 进入页面时把服务端状态过滤对齐到当前标签/下拉（provider 持久化，State 会重建）
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final tab = ref.read(stockInTabProvider);
+      final want = tab == 1 ? 'pending,draft' : _statusFilter;
+      final notifier = ref.read(stockInListProvider.notifier);
+      if (notifier.currentStatus != want) notifier.setStatus(want);
+    });
   }
 
+  @override
+  void dispose() {
+    _searchCtrl.dispose();
+    super.dispose();
+  }
+
+  void _triggerSearch() =>
+      ref.read(stockInListProvider.notifier).setKeyword(_searchCtrl.text.trim());
+
   String? get _startDate => _dateRange != null
       ? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
       : null;
@@ -89,7 +107,13 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
     return PageScaffold(
       title: '入库管理',
       initialTab: ref.read(stockInTabProvider),
-      onTabChanged: (i) => ref.read(stockInTabProvider.notifier).state = i,
+      onTabChanged: (i) {
+        ref.read(stockInTabProvider.notifier).state = i;
+        // 审核标签页按 pending+draft 服务端拉取；入库单页沿用下拉状态（'' 为全部）
+        ref
+            .read(stockInListProvider.notifier)
+            .setStatus(i == 1 ? 'pending,draft' : _statusFilter);
+      },
       tabs: const [
         Tab(text: '入库单'),
         Tab(text: '入库审核'),
@@ -124,15 +148,19 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
       ),
       data: (result) {
         final allOrders = result.data;
+        // 状态过滤已改为服务端驱动（setStatus）。这里仅按标签做轻量显示守卫，
+        // 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
         final List<StockInOrder> statusFiltered;
         if (filterStatus == 'pending') {
+          // 入库审核：服务端按 pending,draft 拉取
           statusFiltered = allOrders
               .where((o) => o.status == 'draft' || o.status == 'pending')
               .toList();
         } else if (filterStatus == 'exclude_pending') {
-          statusFiltered = allOrders
-              .where((o) => o.status != 'draft' && o.status != 'pending')
-              .toList();
+          // 入库单：服务端按下拉状态拉取；'全部状态' 显示全部（含未审核）
+          statusFiltered = _statusFilter.isEmpty
+              ? allOrders
+              : allOrders.where((o) => o.status == _statusFilter).toList();
         } else {
           statusFiltered = allOrders;
         }
@@ -334,6 +362,27 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
               )
             : null;
 
+        final searchField = TextField(
+          controller: _searchCtrl,
+          decoration: InputDecoration(
+            hintText: '单号/往来单位，回车搜索',
+            prefixIcon: const Icon(Icons.search, size: 16),
+            hintStyle: const TextStyle(fontSize: 12),
+            suffixIcon: IconButton(
+              icon: const Icon(Icons.search, size: 16),
+              tooltip: '搜索',
+              onPressed: _triggerSearch,
+            ),
+          ),
+          onSubmitted: (_) => _triggerSearch(),
+        );
+
+        final refreshBtn = IconButton(
+          tooltip: '刷新',
+          icon: const Icon(Icons.refresh, size: 20),
+          onPressed: () => ref.read(stockInListProvider.notifier).reload(),
+        );
+
         final dateBtn = OutlinedButton.icon(
           onPressed: _pickDateRange,
           icon: const Icon(Icons.date_range, size: 16),
@@ -356,28 +405,36 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
             : null;
 
         if (isMobile) {
-          return Wrap(
-            spacing: 8,
-            runSpacing: 4,
-            crossAxisAlignment: WrapCrossAlignment.center,
+          return Column(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              if (newBtn != null) newBtn,
-              if (statusFilter != null) statusFilter,
-              dateBtn,
-              if (clearDate != null) clearDate,
-              IconButton(
-                tooltip: '导出',
-                icon: const Icon(Icons.download, size: 20),
-                onPressed: doExport,
-              ),
-              ColumnToggleButton(
-                columns: _colDefs,
-                hidden: hidden,
-                compact: true,
-                onChanged: (v) {
-                  setState(() => _hiddenCols = v);
-                  ColumnPrefs.save(_screenId, v);
-                },
+              searchField,
+              const SizedBox(height: 8),
+              Wrap(
+                spacing: 8,
+                runSpacing: 4,
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  if (newBtn != null) newBtn,
+                  if (statusFilter != null) statusFilter,
+                  dateBtn,
+                  if (clearDate != null) clearDate,
+                  IconButton(
+                    tooltip: '导出',
+                    icon: const Icon(Icons.download, size: 20),
+                    onPressed: doExport,
+                  ),
+                  ColumnToggleButton(
+                    columns: _colDefs,
+                    hidden: hidden,
+                    compact: true,
+                    onChanged: (v) {
+                      setState(() => _hiddenCols = v);
+                      ColumnPrefs.save(_screenId, v);
+                    },
+                  ),
+                  refreshBtn,
+                ],
               ),
             ],
           );
@@ -385,6 +442,8 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
 
         return Row(
           children: [
+            SizedBox(width: 220, child: searchField),
+            const SizedBox(width: 12),
             if (newBtn != null) newBtn,
             const Spacer(),
             if (statusFilter != null) ...[
@@ -411,6 +470,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
                 ColumnPrefs.save(_screenId, v);
               },
             ),
+            refreshBtn,
           ],
         );
       }),
@@ -1041,6 +1101,7 @@ class _StatusFilterDropdown extends StatelessWidget {
           items: [
             const DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
             const DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
+            const DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
             const DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
             const DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
           ],

client/lib/screens/stock_out/stock_out_form_screen.dart

@@ -9,6 +9,7 @@ import '../../core/utils/print_util.dart';
 import '../../core/utils/date_util.dart';
 import '../../models/stock_out.dart';
 import '../../widgets/date_picker_field.dart';
+import '../../widgets/searchable_option_field.dart';
 import '../../core/config/app_constants.dart';
 import '../../providers/inventory_provider.dart';
 import '../../providers/partner_provider.dart';
@@ -498,24 +499,19 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
                                             const LinearProgressIndicator(),
                                         error: (_, __) => const Text('加载失败'),
                                         data: (warehouses) =>
-                                            DropdownButtonFormField<int>(
-                                          value: _warehouseId,
-                                          hint: const Text('请选择仓库',
-                                              style: TextStyle(fontSize: 13)),
-                                          items: warehouses
-                                              .map((w) => DropdownMenuItem(
-                                                  value: w.id,
-                                                  child: Text(w.name,
-                                                      style: const TextStyle(
-                                                          fontSize: 13))))
+                                            SearchableOptionField(
+                                          options: warehouses
+                                              .map((w) => OptionItem(
+                                                  id: w.id, name: w.name))
                                               .toList(),
+                                          selectedId: _warehouseId,
+                                          hint: '请选择仓库',
+                                          dialogTitle: '选择出库仓库',
+                                          isRequired: true,
                                           onChanged: (v) {
                                             setState(() => _warehouseId = v);
                                             if (v != null) _loadInventory(v);
                                           },
-                                          validator: (v) =>
-                                              v == null ? '不能为空' : null,
-                                          decoration: const InputDecoration(),
                                         ),
                                       ),
                                     ),
@@ -526,20 +522,18 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
                                             const LinearProgressIndicator(),
                                         error: (_, __) => const Text('加载失败'),
                                         data: (result) =>
-                                            DropdownButtonFormField<int>(
-                                          value: _partnerId,
-                                          hint: const Text('请选择客户',
-                                              style: TextStyle(fontSize: 13)),
-                                          items: result.data
-                                              .map((p) => DropdownMenuItem(
-                                                  value: p.id,
-                                                  child: Text(p.name,
-                                                      style: const TextStyle(
-                                                          fontSize: 13))))
+                                            SearchableOptionField(
+                                          options: result.data
+                                              .map((p) => OptionItem(
+                                                  id: p.id,
+                                                  name: p.name,
+                                                  code: p.code))
                                               .toList(),
+                                          selectedId: _partnerId,
+                                          hint: '请选择客户',
+                                          dialogTitle: '选择客户',
                                           onChanged: (v) =>
                                               setState(() => _partnerId = v),
-                                          decoration: const InputDecoration(),
                                         ),
                                       ),
                                     ),

client/lib/screens/stock_out/stock_out_list_screen.dart

@@ -38,6 +38,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
   Set<String> _filterWarehouse = {};
   Set<String> _filterCustomer = {};
   Set<String>? _hiddenCols; // null = 尚未载入本地存档（回退到 minWidth 首次默认）
+  final _searchCtrl = TextEditingController();
 
   static const _screenId = 'stock_out_list';
 
@@ -47,6 +48,14 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
     ColumnPrefs.load(_screenId).then((saved) {
       if (saved != null && mounted) setState(() => _hiddenCols = saved);
     });
+    // 进入页面时把服务端状态过滤对齐到当前标签/下拉（provider 持久化，State 会重建）
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (!mounted) return;
+      final tab = ref.read(stockOutTabProvider);
+      final want = tab == 1 ? 'pending,draft' : _statusFilter;
+      final notifier = ref.read(stockOutListProvider.notifier);
+      if (notifier.currentStatus != want) notifier.setStatus(want);
+    });
   }
 
   static const _colDefs = [
@@ -63,6 +72,16 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
     ColDef('actions', '操作', required: true),
   ];
 
+  @override
+  void dispose() {
+    _searchCtrl.dispose();
+    super.dispose();
+  }
+
+  void _triggerSearch() => ref
+      .read(stockOutListProvider.notifier)
+      .setKeyword(_searchCtrl.text.trim());
+
   String? get _startDate => _dateRange != null
       ? '${_dateRange!.start.year}-${_dateRange!.start.month.toString().padLeft(2, '0')}-${_dateRange!.start.day.toString().padLeft(2, '0')}'
       : null;
@@ -89,7 +108,13 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
     return PageScaffold(
       title: '出库管理',
       initialTab: ref.read(stockOutTabProvider),
-      onTabChanged: (i) => ref.read(stockOutTabProvider.notifier).state = i,
+      onTabChanged: (i) {
+        ref.read(stockOutTabProvider.notifier).state = i;
+        // 审核标签页按 pending+draft 服务端拉取；出库单页沿用下拉状态（'' 为全部）
+        ref
+            .read(stockOutListProvider.notifier)
+            .setStatus(i == 1 ? 'pending,draft' : _statusFilter);
+      },
       tabs: const [
         Tab(text: '出库单'),
         Tab(text: '出库审核'),
@@ -124,15 +149,19 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
       ),
       data: (result) {
         final allOrders = result.data;
+        // 状态过滤已改为服务端驱动（setStatus）。这里仅按标签做轻量显示守卫，
+        // 避免共用 provider 在标签切换、refetch 在途时短暂闪现他状态数据。
         final List<StockOutOrder> statusFiltered;
         if (filterStatus == 'pending') {
+          // 出库审核：服务端按 pending,draft 拉取
           statusFiltered = allOrders
               .where((o) => o.status == 'draft' || o.status == 'pending')
               .toList();
         } else if (filterStatus == 'exclude_pending') {
-          statusFiltered = allOrders
-              .where((o) => o.status != 'draft' && o.status != 'pending')
-              .toList();
+          // 出库单：服务端按下拉状态拉取；'全部状态' 显示全部（含未审核）
+          statusFiltered = _statusFilter.isEmpty
+              ? allOrders
+              : allOrders.where((o) => o.status == _statusFilter).toList();
         } else {
           statusFiltered = allOrders;
         }
@@ -340,6 +369,27 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
               )
             : null;
 
+        final searchField = TextField(
+          controller: _searchCtrl,
+          decoration: InputDecoration(
+            hintText: '单号/往来单位，回车搜索',
+            prefixIcon: const Icon(Icons.search, size: 16),
+            hintStyle: const TextStyle(fontSize: 12),
+            suffixIcon: IconButton(
+              icon: const Icon(Icons.search, size: 16),
+              tooltip: '搜索',
+              onPressed: _triggerSearch,
+            ),
+          ),
+          onSubmitted: (_) => _triggerSearch(),
+        );
+
+        final refreshBtn = IconButton(
+          tooltip: '刷新',
+          icon: const Icon(Icons.refresh, size: 20),
+          onPressed: () => ref.read(stockOutListProvider.notifier).reload(),
+        );
+
         final dateBtn = OutlinedButton.icon(
           onPressed: _pickDateRange,
           icon: const Icon(Icons.date_range, size: 16),
@@ -362,28 +412,36 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
             : null;
 
         if (isMobile) {
-          return Wrap(
-            spacing: 8,
-            runSpacing: 4,
-            crossAxisAlignment: WrapCrossAlignment.center,
+          return Column(
+            mainAxisSize: MainAxisSize.min,
             children: [
-              if (newBtn != null) newBtn,
-              if (statusFilter != null) statusFilter,
-              dateBtn,
-              if (clearDate != null) clearDate,
-              IconButton(
-                tooltip: '导出',
-                icon: const Icon(Icons.download, size: 20),
-                onPressed: doExport,
-              ),
-              ColumnToggleButton(
-                columns: _colDefs,
-                hidden: hidden,
-                compact: true,
-                onChanged: (v) {
-                  setState(() => _hiddenCols = v);
-                  ColumnPrefs.save(_screenId, v);
-                },
+              searchField,
+              const SizedBox(height: 8),
+              Wrap(
+                spacing: 8,
+                runSpacing: 4,
+                crossAxisAlignment: WrapCrossAlignment.center,
+                children: [
+                  if (newBtn != null) newBtn,
+                  if (statusFilter != null) statusFilter,
+                  dateBtn,
+                  if (clearDate != null) clearDate,
+                  IconButton(
+                    tooltip: '导出',
+                    icon: const Icon(Icons.download, size: 20),
+                    onPressed: doExport,
+                  ),
+                  ColumnToggleButton(
+                    columns: _colDefs,
+                    hidden: hidden,
+                    compact: true,
+                    onChanged: (v) {
+                      setState(() => _hiddenCols = v);
+                      ColumnPrefs.save(_screenId, v);
+                    },
+                  ),
+                  refreshBtn,
+                ],
               ),
             ],
           );
@@ -391,6 +449,8 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
 
         return Row(
           children: [
+            SizedBox(width: 220, child: searchField),
+            const SizedBox(width: 12),
             if (newBtn != null) newBtn,
             const Spacer(),
             if (statusFilter != null) ...[
@@ -417,6 +477,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
                 ColumnPrefs.save(_screenId, v);
               },
             ),
+            refreshBtn,
           ],
         );
       }),
@@ -950,6 +1011,7 @@ class _StatusFilterDropdown extends StatelessWidget {
           items: const [
             DropdownMenuItem(value: '', child: Text('全部状态', style: TextStyle(fontSize: 13))),
             DropdownMenuItem(value: 'draft', child: Text('草稿', style: TextStyle(fontSize: 13))),
+            DropdownMenuItem(value: 'pending', child: Text('待审核', style: TextStyle(fontSize: 13))),
             DropdownMenuItem(value: 'approved', child: Text('已审核', style: TextStyle(fontSize: 13))),
             DropdownMenuItem(value: 'rejected', child: Text('已拒绝', style: TextStyle(fontSize: 13))),
           ],