fix(backend): 商品编码改用最大序号生成不复用软删号 + 加 (shop_id,code) 唯一约束，根治重复编码

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

CHANGELOG-client.md

@@ -5,6 +5,12 @@ 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
 
 ### 修复

CHANGELOG-server.md

@@ -5,6 +5,11 @@
 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.68] - 2026-06-21
+
+### 修复
+- 根治商品编码可能重复的问题：自动编码改为按现有最大序号递增生成（不再复用已删除商品占用过的编号、并发下也不会撞号），并在数据库层为「同门店 + 编码」加唯一约束，从此重复编码无法静默产生
+
 ## [1.0.67] - 2026-06-20
 
 ### 修复

backend/internal/handler/product.go

@@ -62,6 +62,29 @@ func (h *ProductHandler) List(c *gin.Context) {
 	})
 }
 
+// nextProductCode 生成该门店下一个自动商品编码（P001、P002…）。
+// 取现有 P 开头编码的最大数字序号 +1，**含软删行**（deleted_at 非空也计入，不复用已删商品占用过的号）。
+// 不加行锁——并发下两请求可能算出同号，由 uk_shop_code 唯一约束 + 调用方 ErrDuplicatedKey 重试兜底。
+// 用 GORM 表达式（非 MySQL 方言 SQL），sqlite 单测也能跑。
+func nextProductCode(tx *gorm.DB, shopID uint64) (string, error) {
+	var codes []string
+	if err := tx.Model(&model.Product{}).
+		Where("shop_id = ? AND code LIKE 'P%'", shopID).
+		Pluck("code", &codes).Error; err != nil {
+		return "", err
+	}
+	maxN := 0
+	for _, c := range codes {
+		if len(c) < 2 {
+			continue
+		}
+		if n, err := strconv.Atoi(c[1:]); err == nil && n > maxN {
+			maxN = n
+		}
+	}
+	return fmt.Sprintf("P%03d", maxN+1), nil
+}
+
 // Create POST /api/v1/products
 func (h *ProductHandler) Create(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
@@ -74,31 +97,24 @@ func (h *ProductHandler) Create(c *gin.Context) {
 	product.PublicID = uuid.New().String()
 	product.NamePinyin, product.NameInitials = util.ToPinyin(product.Name)
 
-	// Auto-generate product code if not provided (e.g. P001, P002)
+	// 未显式指定编码时自动生成（事务内 max+1）；撞 uk_shop_code 唯一约束则重算下一号重试（应对并发）。
-	// Retry up to 5 times on duplicate key to handle concurrent creates
+	autoCode := product.Code == ""
-	if product.Code == "" {
-		var count int64
-		h.db.Model(&model.Product{}).
-			Where("shop_id = ? AND deleted_at IS NULL", shopID).
-			Count(&count)
-		product.Code = fmt.Sprintf("P%03d", count+1)
-	}
-
 	var createErr error
 	for attempt := 0; attempt < 5; attempt++ {
-		if createErr = h.db.Create(&product).Error; createErr == nil {
+		createErr = h.db.Transaction(func(tx *gorm.DB) error {
+			if autoCode {
+				code, err := nextProductCode(tx, shopID)
+				if err != nil {
+					return err
+				}
+				product.Code = code
+			}
+			product.ID = 0
+			return tx.Create(&product).Error
+		})
+		if createErr == nil || !autoCode || !errors.Is(createErr, gorm.ErrDuplicatedKey) {
 			break
 		}
-		if !errors.Is(createErr, gorm.ErrDuplicatedKey) {
-			break
-		}
-		// Duplicate code: try next slot
-		var count int64
-		h.db.Model(&model.Product{}).
-			Where("shop_id = ? AND deleted_at IS NULL", shopID).
-			Count(&count)
-		product.ID = 0
-		product.Code = fmt.Sprintf("P%03d", count+int64(attempt)+2)
 	}
 	if createErr != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": createErr.Error()})
@@ -256,25 +272,37 @@ func (h *ProductHandler) FindOrCreate(c *gin.Context) {
 		return
 	}
 
-	var count int64
-	h.db.Model(&model.Product{}).Where("shop_id = ? AND deleted_at IS NULL", shopID).Count(&count)
 	namePinyin, nameInitials := util.ToPinyin(req.Name)
-	product = model.Product{
+	// 事务内 max+1 生成编码；撞 uk_shop_code 唯一约束则重算下一号重试（应对并发）。
-		TenantBase:       model.TenantBase{ShopID: shopID},
+	var createErr error
-		PublicID:         uuid.New().String(),
+	for attempt := 0; attempt < 5; attempt++ {
-		Name:             req.Name,
+		createErr = h.db.Transaction(func(tx *gorm.DB) error {
-		Series:           req.Series,
+			code, err := nextProductCode(tx, shopID)
-		Spec:             req.Spec,
+			if err != nil {
-		Code:             fmt.Sprintf("P%03d", count+1),
+				return err
-		NamePinyin:       namePinyin,
+			}
-		NameInitials:     nameInitials,
+			product = model.Product{
-		OriginID:         req.OriginID,
+				TenantBase:       model.TenantBase{ShopID: shopID},
-		ShelfLifeID:      req.ShelfLifeID,
+				PublicID:         uuid.New().String(),
-		StorageID:        req.StorageID,
+				Name:             req.Name,
-		DescriptionDocID: req.DescriptionDocID,
+				Series:           req.Series,
+				Spec:             req.Spec,
+				Code:             code,
+				NamePinyin:       namePinyin,
+				NameInitials:     nameInitials,
+				OriginID:         req.OriginID,
+				ShelfLifeID:      req.ShelfLifeID,
+				StorageID:        req.StorageID,
+				DescriptionDocID: req.DescriptionDocID,
+			}
+			return tx.Create(&product).Error
+		})
+		if createErr == nil || !errors.Is(createErr, gorm.ErrDuplicatedKey) {
+			break
+		}
 	}
-	if createErr := h.db.Create(&product).Error; createErr != nil {
+	if createErr != nil {
-		// Race condition: try to find the record created by another request
+		// Race condition: 并发可能已按同 name/series/spec 建好，回查返回既有
 		if h.db.Where("shop_id = ? AND name = ? AND series = ? AND spec = ? AND deleted_at IS NULL",
 			shopID, req.Name, req.Series, req.Spec).First(&product).Error == nil {
 			util.RespondSuccess(c, product)

backend/internal/handler/product_test.go

@@ -2,13 +2,16 @@ package handler
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gorm.io/gorm"
 
+	"github.com/wangjia/jiu/backend/internal/model"
 	"github.com/wangjia/jiu/backend/testutil"
 )
 
@@ -199,3 +202,67 @@ func TestProductHandler_Create_ShopIDFromToken(t *testing.T) {
 	dataBytes, _ := json.Marshal(data)
 	_ = dataBytes
 }
+
+// 自动编码按最大序号递增：P001 → P002 → P003。
+func TestProductHandler_AutoCode_Increment(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "AC001")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	var codes []string
+	for i := 0; i < 3; i++ {
+		w := makeRequest(r, "POST", "/api/v1/products", token, map[string]interface{}{
+			"name": fmt.Sprintf("AutoP %d", i), "unit": "个",
+		})
+		require.Equal(t, http.StatusCreated, w.Code)
+		data := parseResponse(w)["data"].(map[string]interface{})
+		codes = append(codes, data["code"].(string))
+	}
+	assert.Equal(t, []string{"P001", "P002", "P003"}, codes)
+}
+
+// 软删商品后，新建不复用被删的号（旧 count+1 逻辑会复用 → 重复，此为根因修复回归测试）。
+func TestProductHandler_AutoCode_NoReuseAfterSoftDelete(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "AC002")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	var lastID uint64
+	for i := 0; i < 3; i++ { // P001 P002 P003
+		w := makeRequest(r, "POST", "/api/v1/products", token, map[string]interface{}{
+			"name": fmt.Sprintf("NR %d", i), "unit": "个",
+		})
+		require.Equal(t, http.StatusCreated, w.Code)
+		lastID = extractID(w)
+	}
+	// 软删 P003
+	w := makeRequest(r, "DELETE", fmt.Sprintf("/api/v1/products/%d", lastID), token, nil)
+	require.Equal(t, http.StatusOK, w.Code)
+
+	// 再建 → 必须是 P004，不能复用已软删的 P003
+	w = makeRequest(r, "POST", "/api/v1/products", token, map[string]interface{}{
+		"name": "NR new", "unit": "个",
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+	data := parseResponse(w)["data"].(map[string]interface{})
+	assert.Equal(t, "P004", data["code"])
+}
+
+// (shop_id, code) 唯一约束生效，且重复被翻译成 gorm.ErrDuplicatedKey（Create/FindOrCreate 重试的前提）。
+func TestProductHandler_UniqueShopCode(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "UQ001")
+	require.NoError(t, db.Exec("CREATE UNIQUE INDEX uk_shop_code ON products(shop_id, code)").Error)
+
+	p1 := model.Product{TenantBase: model.TenantBase{ShopID: shop.ID}, Name: "A", Code: "P001"}
+	require.NoError(t, db.Create(&p1).Error)
+
+	p2 := model.Product{TenantBase: model.TenantBase{ShopID: shop.ID}, Name: "B", Code: "P001"}
+	err := db.Create(&p2).Error
+	require.Error(t, err)
+	assert.True(t, errors.Is(err, gorm.ErrDuplicatedKey))
+}

backend/internal/model/product.go

@@ -10,6 +10,8 @@ type ProductCategory struct {
 type Product struct {
 	TenantBase
 	PublicID      string  `gorm:"size:36;uniqueIndex" json:"public_id"`
+	// Code 商品编码：同店内唯一。(shop_id, code) 联合唯一索引 uk_shop_code 由 autoMigrate 显式建（见 main.go），
+	// 不在此用 tag 声明——ShopID 在共用 TenantBase 上，tag 只能建单列索引会破坏多租户隔离。
 	Code          string  `gorm:"size:50" json:"code"`
 	Barcode       string  `gorm:"size:100" json:"barcode"`
 	Name          string  `gorm:"size:200;not null" json:"name"`

backend/main.go

@@ -87,7 +87,8 @@ func initDB() *gorm.DB {
 	}
 
 	db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{
-		Logger: logger.Default.LogMode(logLevel),
+		Logger:         logger.Default.LogMode(logLevel),
+		TranslateError: true, // 把 MySQL 1062 翻译成 gorm.ErrDuplicatedKey，供编码撞唯一约束时重试
 	})
 	if err != nil {
 		log.Fatalf("failed to connect database: %v", err)
@@ -136,5 +137,12 @@ func autoMigrate(db *gorm.DB) {
 	if err != nil {
 		log.Fatalf("auto migrate failed: %v", err)
 	}
+	// products(shop_id, code) 联合唯一索引：ShopID 在共用 TenantBase 上无法用 struct tag 表达，
+	// 故在此幂等显式建（保证同店内商品编码唯一，DB 层兜底防止重复编码静默落库）。
+	if !db.Migrator().HasIndex(&model.Product{}, "uk_shop_code") {
+		if err := db.Exec("CREATE UNIQUE INDEX uk_shop_code ON products (shop_id, code)").Error; err != nil {
+			log.Fatalf("create unique index uk_shop_code failed: %v", err)
+		}
+	}
 	log.Println("AutoMigrate completed")
 }

backend/testutil/setup.go

@@ -46,7 +46,8 @@ func SetupTestDB() *gorm.DB {
 	InitConfig()
 
 	db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
+		Logger:         logger.Default.LogMode(logger.Silent),
+		TranslateError: true,
 	})
 	if err != nil {
 		panic(fmt.Sprintf("failed to open sqlite: %v", err))

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,
         );
@@ -76,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,
         );
@@ -76,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/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_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';
 
@@ -71,6 +72,15 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
     });
   }
 
+  @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;
@@ -352,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),
@@ -374,28 +405,36 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
             : null;
 
         if (isMobile) {
-          return Wrap(
+          return Column(
-            spacing: 8,
+            mainAxisSize: MainAxisSize.min,
-            runSpacing: 4,
-            crossAxisAlignment: WrapCrossAlignment.center,
             children: [
-              if (newBtn != null) newBtn,
+              searchField,
-              if (statusFilter != null) statusFilter,
+              const SizedBox(height: 8),
-              dateBtn,
+              Wrap(
-              if (clearDate != null) clearDate,
+                spacing: 8,
-              IconButton(
+                runSpacing: 4,
-                tooltip: '导出',
+                crossAxisAlignment: WrapCrossAlignment.center,
-                icon: const Icon(Icons.download, size: 20),
+                children: [
-                onPressed: doExport,
+                  if (newBtn != null) newBtn,
-              ),
+                  if (statusFilter != null) statusFilter,
-              ColumnToggleButton(
+                  dateBtn,
-                columns: _colDefs,
+                  if (clearDate != null) clearDate,
-                hidden: hidden,
+                  IconButton(
-                compact: true,
+                    tooltip: '导出',
-                onChanged: (v) {
+                    icon: const Icon(Icons.download, size: 20),
-                  setState(() => _hiddenCols = v);
+                    onPressed: doExport,
-                  ColumnPrefs.save(_screenId, v);
+                  ),
-                },
+                  ColumnToggleButton(
+                    columns: _colDefs,
+                    hidden: hidden,
+                    compact: true,
+                    onChanged: (v) {
+                      setState(() => _hiddenCols = v);
+                      ColumnPrefs.save(_screenId, v);
+                    },
+                  ),
+                  refreshBtn,
+                ],
               ),
             ],
           );
@@ -403,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) ...[
@@ -429,6 +470,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
                 ColumnPrefs.save(_screenId, v);
               },
             ),
+            refreshBtn,
           ],
         );
       }),

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';
 
@@ -71,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;
@@ -358,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),
@@ -380,28 +412,36 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
             : null;
 
         if (isMobile) {
-          return Wrap(
+          return Column(
-            spacing: 8,
+            mainAxisSize: MainAxisSize.min,
-            runSpacing: 4,
-            crossAxisAlignment: WrapCrossAlignment.center,
             children: [
-              if (newBtn != null) newBtn,
+              searchField,
-              if (statusFilter != null) statusFilter,
+              const SizedBox(height: 8),
-              dateBtn,
+              Wrap(
-              if (clearDate != null) clearDate,
+                spacing: 8,
-              IconButton(
+                runSpacing: 4,
-                tooltip: '导出',
+                crossAxisAlignment: WrapCrossAlignment.center,
-                icon: const Icon(Icons.download, size: 20),
+                children: [
-                onPressed: doExport,
+                  if (newBtn != null) newBtn,
-              ),
+                  if (statusFilter != null) statusFilter,
-              ColumnToggleButton(
+                  dateBtn,
-                columns: _colDefs,
+                  if (clearDate != null) clearDate,
-                hidden: hidden,
+                  IconButton(
-                compact: true,
+                    tooltip: '导出',
-                onChanged: (v) {
+                    icon: const Icon(Icons.download, size: 20),
-                  setState(() => _hiddenCols = v);
+                    onPressed: doExport,
-                  ColumnPrefs.save(_screenId, v);
+                  ),
-                },
+                  ColumnToggleButton(
+                    columns: _colDefs,
+                    hidden: hidden,
+                    compact: true,
+                    onChanged: (v) {
+                      setState(() => _hiddenCols = v);
+                      ColumnPrefs.save(_screenId, v);
+                    },
+                  ),
+                  refreshBtn,
+                ],
               ),
             ],
           );
@@ -409,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) ...[
@@ -435,6 +477,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
                 ColumnPrefs.save(_screenId, v);
               },
             ),
+            refreshBtn,
           ],
         );
       }),