feat(client): 入库录入去除按名称复用，明细带产品信息由后端建独立产品

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

.gitea/workflows/backup.yml

@@ -1,37 +1,35 @@
 name: DB Backup
 
 on:
-  # 定时备份已暂停（保留手动触发）。恢复时取消下面 schedule 的注释即可。
-  # schedule:
-  #   - cron: '0 18 * * *'  # UTC 18:00 = 北京时间 02:00
+  # 每日定时备份（北京时间 02:00）。手动触发亦可。
+  schedule:
+    - cron: '0 18 * * *'  # UTC 18:00 = 北京时间 02:00
   workflow_dispatch:
 
+concurrency:
+  group: db-backup
+  cancel-in-progress: false
+
 jobs:
   backup:
-    runs-on: ubuntu-latest
+    runs-on: mac
     steps:
-      - name: Setup SSH
-        run: |
-          mkdir -p ~/.ssh
-          printf '%s' "${{ secrets.EC2_SSH_KEY }}" > ~/.ssh/ec2.pem
-          chmod 600 ~/.ssh/ec2.pem
-          ssh-keyscan -H ${{ secrets.EC2_HOST }} >> ~/.ssh/known_hosts
+      - uses: actions/checkout@v4
 
-      - name: Dump MySQL to NAS
+      - name: Dump MySQL to local backup dir
         env:
+          EC2_SSH_KEY: ${{ secrets.EC2_SSH_KEY }}
           EC2_HOST: ${{ secrets.EC2_HOST }}
           EC2_USER: ${{ secrets.EC2_USER }}
-          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-        run: |
-          BACKUP_DIR=/volume1/docker/backups/jiu-db
-          mkdir -p $BACKUP_DIR
-          FILENAME="jiu_db_$(date +%Y%m%d_%H%M%S).sql.gz"
-          ssh -i ~/.ssh/ec2.pem ${EC2_USER}@${EC2_HOST} \
-            "docker exec jiu_mysql mysqldump -uroot -p${DB_PASSWORD} jiu_db" \
-            | gzip > ${BACKUP_DIR}/${FILENAME}
-          find $BACKUP_DIR -name "*.sql.gz" -mtime +30 -delete
-          echo "Saved: ${BACKUP_DIR}/${FILENAME}"
+        run: sh scripts/ci/backup-db.sh
 
-      - name: Cleanup SSH key
+      - name: Notify (Telegram)
         if: always()
-        run: rm -f ~/.ssh/ec2.pem
+        env:
+          TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
+          TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
+        run: |
+          if [ "${{ job.status }}" = "success" ]; then ICON="✅"; LABEL="数据库备份成功"; else ICON="❌"; LABEL="数据库备份失败"; fi
+          curl -f -X POST "https://api.telegram.org/bot${TELEGRAM_TOKEN}/sendMessage" \
+            -d "chat_id=${TELEGRAM_CHAT_ID}" \
+            --data-urlencode "text=${ICON} 岩美 ${LABEL}" > /dev/null || true

CHANGELOG-client.md

@@ -5,6 +5,31 @@ 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.65] - 2026-06-21
+
+### 改进
+- 入库录入改为「每行一个独立产品」：每条明细对应一个独立编号，同名同规格录多次也各自独立（配合后端 server-v1.0.69）
+
+## [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,35 @@
 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.69] - 2026-06-21
+
+### 改进
+- 入库录入改为「每行一个独立产品」：每条明细新建独立商品、发独立序列号（同名同规格录多次也各自独立），不再复用已有商品编号，符合"每个货品一个唯一编号"的管理方式
+
+## [1.0.68] - 2026-06-21
+
+### 修复
+- 根治商品编码可能重复的问题：自动编码改为按现有最大序号递增生成（不再复用已删除商品占用过的编号、并发下也不会撞号），并在数据库层为「同门店 + 编码」加唯一约束，从此重复编码无法静默产生
+
+## [1.0.67] - 2026-06-20
+
+### 修复
+- 历史导入单审核入库后，库存里商品显示为「历史导入占位」、按真实名搜不到的问题：审核生成库存时改用单据明细自带的真实商品名/编码/系列/规格，库存列表也不再显示已删除的占位商品名
+- 库存列表按真实商品名/编码即可搜到这些历史商品
+
+### 新功能
+- 入库单 / 出库单列表支持关键词搜索：按单号或往来单位名称即时筛选
+
+## [1.0.66] - 2026-06-20
+
+### 修复
+- 入库/出库单据列表改为按业务日期（入库/出库日期）倒序排列：从旧系统迁入的历史单据按真实日期归位到列表顶部，不再因录入时间晚、被排到末尾分页而在首页遗漏
+
+## [1.0.65] - 2026-06-20
+
+### 修复
+- 单据列表状态筛选支持一次查询多种状态，配合客户端修复让「入库审核 / 出库审核」标签页完整列出全部待审核单据，不再因分页只显示部分
+
 ## [1.0.64] - 2026-06-20
 
 ### 改进

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/product.go

@@ -62,6 +62,65 @@ 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
+}
+
+// createIndependentProduct 为入库明细新建一个独立产品（特有产品/序列号），返回新 product。
+// "入库每行 = 一个特有产品"模型:每条明细建一个独立 product、发新序列号,不按名称复用。
+// 含 nextProductCode 自增 + 撞 uk_shop_code 唯一约束时重试。必须在事务内调用。
+func createIndependentProduct(tx *gorm.DB, shopID uint64, name, series, spec, batchNo string, prodDate *model.Date, price float64) (model.Product, error) {
+	namePinyin, nameInitials := util.ToPinyin(name)
+	var prod model.Product
+	var err error
+	for attempt := 0; attempt < 5; attempt++ {
+		code, e := nextProductCode(tx, shopID)
+		if e != nil {
+			return model.Product{}, e
+		}
+		prod = model.Product{
+			TenantBase:     model.TenantBase{ShopID: shopID},
+			PublicID:       uuid.New().String(),
+			Code:           code,
+			Name:           name,
+			Series:         series,
+			Spec:           spec,
+			BatchNo:        batchNo,
+			ProductionDate: prodDate,
+			PurchasePrice:  price,
+			NamePinyin:     namePinyin,
+			NameInitials:   nameInitials,
+		}
+		prod.ID = 0
+		if err = tx.Create(&prod).Error; err == nil || !errors.Is(err, gorm.ErrDuplicatedKey) {
+			break
+		}
+	}
+	if err != nil {
+		return model.Product{}, err
+	}
+	return prod, nil
+}
+
 // Create POST /api/v1/products
 func (h *ProductHandler) Create(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
@@ -74,31 +133,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)
-	// Retry up to 5 times on duplicate key to handle concurrent creates
-	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)
-	}
-
+	// 未显式指定编码时自动生成（事务内 max+1）；撞 uk_shop_code 唯一约束则重算下一号重试（应对并发）。
+	autoCode := product.Code == ""
 	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 +308,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{
-		TenantBase:       model.TenantBase{ShopID: shopID},
-		PublicID:         uuid.New().String(),
-		Name:             req.Name,
-		Series:           req.Series,
-		Spec:             req.Spec,
-		Code:             fmt.Sprintf("P%03d", count+1),
-		NamePinyin:       namePinyin,
-		NameInitials:     nameInitials,
-		OriginID:         req.OriginID,
-		ShelfLifeID:      req.ShelfLifeID,
-		StorageID:        req.StorageID,
-		DescriptionDocID: req.DescriptionDocID,
+	// 事务内 max+1 生成编码；撞 uk_shop_code 唯一约束则重算下一号重试（应对并发）。
+	var createErr error
+	for attempt := 0; attempt < 5; attempt++ {
+		createErr = h.db.Transaction(func(tx *gorm.DB) error {
+			code, err := nextProductCode(tx, shopID)
+			if err != nil {
+				return err
+			}
+			product = model.Product{
+				TenantBase:       model.TenantBase{ShopID: shopID},
+				PublicID:         uuid.New().String(),
+				Name:             req.Name,
+				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 {
-		// Race condition: try to find the record created by another request
+	if createErr != nil {
+		// 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/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})
 }
@@ -98,19 +106,28 @@ func (h *StockInHandler) Create(c *gin.Context) {
 	}
 	req.OrderNo = orderNo
 
-	// 计算总金额；自动生成批次号
-	var total float64
-	for i := range req.Items {
-		req.Items[i].ShopID = shopID
-		req.Items[i].TotalPrice = req.Items[i].Quantity * req.Items[i].UnitPrice
-		total += req.Items[i].TotalPrice
-		if req.Items[i].BatchNo == "" {
-			req.Items[i].BatchNo = fmt.Sprintf("%s-%02d", req.OrderNo, i+1)
+	// 事务内：每条明细新建一个独立产品（特有产品/序列号，不按名称复用），回填 product_id，再建单。
+	err = h.db.Transaction(func(tx *gorm.DB) error {
+		var total float64
+		for i := range req.Items {
+			it := &req.Items[i]
+			it.ShopID = shopID
+			if it.BatchNo == "" {
+				it.BatchNo = fmt.Sprintf("%s-%02d", req.OrderNo, i+1)
+			}
+			prod, e := createIndependentProduct(tx, shopID, it.ProductName, it.Series, it.Spec, it.BatchNo, it.ProductionDate, it.UnitPrice)
+			if e != nil {
+				return e
+			}
+			it.ProductID = prod.ID
+			it.ProductCode = prod.Code // 保留快照,兼容现有查询(瘦身阶段再去)
+			it.TotalPrice = it.Quantity * it.UnitPrice
+			total += it.TotalPrice
 		}
-	}
-	req.TotalAmount = total
-
-	if err := h.db.Create(&req).Error; err != nil {
+		req.TotalAmount = total
+		return tx.Create(&req).Error
+	})
+	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
@@ -140,13 +157,20 @@ func (h *StockInHandler) Update(c *gin.Context) {
 		}
 		var total float64
 		for i := range req.Items {
-			req.Items[i].ShopID = shopID
-			req.Items[i].OrderID = order.ID
-			req.Items[i].TotalPrice = req.Items[i].Quantity * req.Items[i].UnitPrice
-			total += req.Items[i].TotalPrice
-			if req.Items[i].BatchNo == "" {
-				req.Items[i].BatchNo = fmt.Sprintf("%s-%02d", order.OrderNo, i+1)
+			it := &req.Items[i]
+			it.ShopID = shopID
+			it.OrderID = order.ID
+			if it.BatchNo == "" {
+				it.BatchNo = fmt.Sprintf("%s-%02d", order.OrderNo, i+1)
 			}
+			// 编辑草稿:旧明细已删,每条按新模型重建独立产品（旧草稿 product 无库存,暂留待后续清理）
+			prod, e := createIndependentProduct(tx, shopID, it.ProductName, it.Series, it.Spec, it.BatchNo, it.ProductionDate, it.UnitPrice)
+			if e != nil {
+				return e
+			}
+			it.ProductID = prod.ID
+			it.ProductCode = prod.Code
+			it.TotalPrice = it.Quantity * it.UnitPrice
 		}
 		updates := map[string]interface{}{
 			"warehouse_id": req.WarehouseID,

backend/internal/handler/stock_in_test.go

@@ -28,9 +28,11 @@ func TestStockInHandler_FullFlow(t *testing.T) {
 		"order_date":   time.Now().Format(time.RFC3339),
 		"items": []map[string]interface{}{
 			{
-				"product_id": product.ID,
-				"quantity":   10.0,
-				"unit_price": 5.0,
+				"product_name": "Test Beer",
+				"series":       "普通",
+				"spec":         "500ml",
+				"quantity":     10.0,
+				"unit_price":   5.0,
 			},
 		},
 	})
@@ -57,15 +59,17 @@ func TestStockInHandler_FullFlow(t *testing.T) {
 	w = makeRequest(r, "PUT", fmt.Sprintf("/api/v1/stock-in/orders/%d/approve", orderID), token, nil)
 	require.Equal(t, http.StatusOK, w.Code)
 
-	// 5. 验证库存变化
+	// 5. 验证库存变化：入库为明细新建了独立产品，库存指向它（不是预设的 product）
 	var inv model.Inventory
-	db.Where("shop_id = ? AND warehouse_id = ? AND product_id = ?",
-		shop.ID, warehouse.ID, product.ID).First(&inv)
+	db.Where("shop_id = ? AND warehouse_id = ?",
+		shop.ID, warehouse.ID).First(&inv)
 	assert.Equal(t, float64(10), inv.Quantity)
+	assert.NotZero(t, inv.ProductID)
+	assert.NotEqual(t, product.ID, inv.ProductID)
 
 	// 6. 验证库存流水
 	var logs []model.InventoryLog
-	db.Where("shop_id = ? AND product_id = ?", shop.ID, product.ID).Find(&logs)
+	db.Where("shop_id = ? AND product_id = ?", shop.ID, inv.ProductID).Find(&logs)
 	require.Len(t, logs, 1)
 	assert.Equal(t, "in", logs[0].Direction)
 	assert.Equal(t, float64(10), logs[0].Quantity)
@@ -308,6 +312,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 +392,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/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"`
@@ -20,6 +22,9 @@ type Product struct {
 	Brand         string  `gorm:"size:100" json:"brand"`
 	PurchasePrice float64 `gorm:"type:decimal(12,2)" json:"purchase_price"`
 	SalePrice     float64 `gorm:"type:decimal(12,2)" json:"sale_price"`
+	// 特有产品的批次属性：每个 product = 一个特有产品/序列号，生产日期/批次归此（单一来源）
+	ProductionDate *Date  `gorm:"type:date" json:"production_date"`
+	BatchNo        string `gorm:"size:50" json:"batch_no"`
 	MinStock      int     `gorm:"default:0" json:"min_stock"`
 	Description   string  `gorm:"type:text" json:"description"`
 	CustomFields    JSON    `gorm:"type:json" json:"custom_fields,omitempty"`

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/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))
@@ -187,6 +188,8 @@ func SetupTestDB() *gorm.DB {
 			brand TEXT,
 			purchase_price REAL,
 			sale_price REAL,
+			production_date DATETIME,
+			batch_no TEXT,
 			min_stock INTEGER DEFAULT 0,
 			description TEXT,
 			custom_fields TEXT,

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

@@ -11,7 +11,6 @@ import '../../models/stock_in.dart';
 import '../../core/config/app_constants.dart';
 import '../../providers/partner_provider.dart';
 import '../../providers/product_option_provider.dart';
-import '../../providers/product_provider.dart';
 import '../../providers/inventory_provider.dart';
 import '../../providers/stock_in_provider.dart';
 import '../../providers/warehouse_provider.dart';
@@ -306,58 +305,22 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
 
     setState(() => _submitting = true);
 
-    // Resolve product IDs for items where productId is null
+    // 入库每行 = 一个特有产品：明细只带 名称/系列/规格(字典文本) + 批次/生产日期，
+    // 由后端为每行新建独立产品(序列号)，前端不再 findOrCreate 复用。
     final nameOpts = ref.read(productNameListProvider).valueOrNull ?? [];
     final seriesOpts = ref.read(productSeriesListProvider).valueOrNull ?? [];
     final specOpts = ref.read(productSpecListProvider).valueOrNull ?? [];
+    String optName(List<dynamic> opts, int? id) =>
+        opts.where((o) => o.id == id).firstOrNull?.name as String? ?? '';
 
     for (final item in _items) {
-      if (item.productId == null) {
-        final name = nameOpts
-                .where((o) => o.id == item.selectedNameId)
-                .firstOrNull
-                ?.name ??
-            '';
-        final series = seriesOpts
-                .where((o) => o.id == item.selectedSeriesId)
-                .firstOrNull
-                ?.name ??
-            '';
-        final spec = specOpts
-                .where((o) => o.id == item.selectedSpecId)
-                .firstOrNull
-                ?.name ??
-            '';
-        if (name.isEmpty) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-                content: Text('请选择商品名称'), backgroundColor: AppTheme.danger),
-          );
-          setState(() => _submitting = false);
-          return;
-        }
-        try {
-          final product =
-              await ref.read(productRepositoryProvider).findOrCreate(
-                    name: name,
-                    series: series,
-                    spec: spec,
-                    originId: item.selectedOriginId,
-                    shelfLifeId: item.selectedShelfLifeId,
-                    storageId: item.selectedStorageId,
-                    descriptionDocId: item.selectedDescriptionDocId,
-                  );
-          item.productId = product.id;
-        } catch (e) {
-          if (mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                  content: Text('商品查找失败：$e'), backgroundColor: AppTheme.danger),
-            );
-            setState(() => _submitting = false);
-          }
-          return;
-        }
+      if (optName(nameOpts, item.selectedNameId).isEmpty) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+              content: Text('请选择商品名称'), backgroundColor: AppTheme.danger),
+        );
+        setState(() => _submitting = false);
+        return;
       }
     }
 
@@ -367,7 +330,9 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
       final batchNo = item.batchNoCtrl.text.trim();
       final productionDate = item.productionDateCtrl.text.trim();
       return {
-        'product_id': item.productId ?? 0,
+        'product_name': optName(nameOpts, item.selectedNameId),
+        'series': optName(seriesOpts, item.selectedSeriesId),
+        'spec': optName(specOpts, item.selectedSpecId),
         'quantity': qty,
         'unit_price': price,
         'total_price': qty * price,
@@ -604,24 +569,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 +593,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))),
           ],

scripts/ci/backup-db.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+# backup-db.sh — dump the production MySQL (jiu_db) from EC2 and keep a gzip
+# snapshot on the mac (host) runner's local disk (~/jiu-db-backups), retaining
+# the last 30 days. The DB password is read on EC2 from production.env's
+# DATABASE_DSN, so no DB-password secret is needed.
+#
+# Requires env (same as deploy-server): EC2_SSH_KEY, EC2_HOST, EC2_USER.
+set -euo pipefail
+
+# shellcheck source=scripts/ci/lib-forgejo.sh
+. "$(dirname "$0")/lib-forgejo.sh"
+
+BACKUP_DIR="${HOME}/jiu-db-backups"
+mkdir -p "${BACKUP_DIR}"
+FILENAME="jiu_db_$(date +%Y%m%d_%H%M%S).sql.gz"
+DEST="${BACKUP_DIR}/${FILENAME}"
+
+setup_ssh
+trap teardown_ssh EXIT
+
+echo "==> backup-db: dumping jiu_db from ${EC2_HOST}"
+# On EC2: parse the DSN password from production.env, then mysqldump the
+# container to stdout; stream back over ssh and gzip locally. The heredoc is
+# single-quoted, so it runs verbatim on EC2 (no local expansion). ${SSH} carries
+# no -t, keeping stdout a clean dump stream.
+${SSH} "${EC2_USER}@${EC2_HOST}" 'bash -s' <<'ENDSSH' | gzip > "${DEST}"
+set -euo pipefail
+PW=$(python3 -c 'import re;e=open("/opt/jiu/config/production.env").read();d=re.search(r"DATABASE_DSN=(.*)",e).group(1).strip().strip(chr(34)).strip(chr(39));print(re.match(r"[^:]+:([^@]+)@",d).group(1))')
+exec docker exec -e MYSQL_PWD="${PW}" jiu_mysql mysqldump -uroot --single-transaction --no-tablespaces jiu_db
+ENDSSH
+
+# Integrity + sanity + retention.
+gzip -t "${DEST}"
+SIZE=$(stat -f%z "${DEST}" 2>/dev/null || stat -c%s "${DEST}")
+if [ "${SIZE}" -lt 100000 ]; then
+  echo "==> backup-db: dump suspiciously small (${SIZE} bytes), aborting" >&2
+  rm -f "${DEST}"
+  exit 1
+fi
+find "${BACKUP_DIR}" -name '*.sql.gz' -mtime +30 -delete
+echo "==> backup-db: saved ${DEST} (${SIZE} bytes)"