feat(client): 列表日期列改名入库/出库时间删审核时间列 + 日期控件改可键入框带日历

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx
feat(client): 入库录入去除按名称复用，明细带产品信息由后端建独立产品
2026-06-21 16:39:32 +08:00 · 2026-06-21 16:30:37 +08:00 · 2026-06-21 16:30:11 +08:00 · 2026-06-21 11:39:28 +08:00 · 2026-06-21 10:51:34 +08:00 · 2026-06-20 16:03:01 +08:00
103 changed files with 1429 additions and 711 deletions
@@ -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
@@ -66,3 +66,6 @@ backend/gencode

 # iOS 证书私钥（绝不入库）
 .ios-certs/
+
+# brainstorming visual companion
+.superpowers/
@@ -5,6 +5,46 @@ 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.66] - 2026-06-21
+
+### 改进
+- 入库/出库列表「日期」列改名为「入库时间/出库时间」，移除恒为空的旧「审核时间」列
+- 日期选择改为可直接键入的输入框 + 日历图标：能直接打年份（选老年份方便），支持只填到年或年月（自动补为月初）
+
+## [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
+
+### 改进
+- 全平台应用名统一为「岩美酒库」：macOS 此前窗口标题与应用名显示为 jiu_client，现与各端一致
+- 应用图标更新为最新品牌图标，覆盖 Windows 桌面 / 任务栏 / 标题栏 / 快捷方式及 macOS、iOS、Android、网页各端
+
+### 修复
+- 修复设备管理中 Windows 设备「平台」显示为「未知 桌面端」的问题，更新本版本并重新登录后正确显示为 Windows
+
 ## [1.0.60] - 2026-06-20

 ### 新功能
@@ -5,6 +5,41 @@
 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
+
+### 改进
+- 登录设备并发限制改为「按账号统计全部平台合计」：同一账号在桌面、移动、Web 各端加起来最多同时在线 5 台设备（原先各平台分别计数）
+- 达到设备上限时，新设备登录会被明确拒绝并提示「已达到登录设备上限，请提升额度或下线其他设备后重试」，不再静默把最早登录的设备顶下线——由用户自行决定下线哪台或提升额度
+
 ## [1.0.63] - 2026-06-20

 ### 新功能
@@ -36,9 +36,10 @@ type JWTConfig struct {

 // SessionConfig 登录会话与并发限制（全局默认，可被每店 session_policy 覆盖）。
 type SessionConfig struct {
-	LimitDesktop  int `mapstructure:"limit_desktop"`   // 桌面端(win/mac/linux)最大并发会话，0=禁止
-	LimitMobile   int `mapstructure:"limit_mobile"`    // 移动端(android/ios)最大并发会话，0=禁止
-	LimitWeb      int `mapstructure:"limit_web"`       // web 端最大并发会话，0=禁止
+	LimitTotal    int `mapstructure:"limit_total"`     // 单用户跨全部平台的最大并发会话总数（超额踢最旧）
+	LimitDesktop  int `mapstructure:"limit_desktop"`   // 桌面端(win/mac/linux)平台闸门，0=禁止该平台登录
+	LimitMobile   int `mapstructure:"limit_mobile"`    // 移动端(android/ios)平台闸门，0=禁止该平台登录
+	LimitWeb      int `mapstructure:"limit_web"`       // web 端平台闸门，0=禁止该平台登录
 	MaxFailures   int `mapstructure:"max_failures"`    // 同一账号连续登录失败几次后锁定
 	IPMaxFailures int `mapstructure:"ip_max_failures"` // 同一 IP 跨账号累计失败几次后锁定该 IP（防单 IP 撞多账号）
 	LockMinutes   int `mapstructure:"lock_minutes"`    // 锁定时长（分钟）
@@ -92,7 +93,8 @@ func Load() {
 	viper.SetDefault("server.cors_origin", "*")
 	viper.SetDefault("jwt.access_expire_min", 60)
 	viper.SetDefault("jwt.refresh_expire_h", 168) // 7天
-	viper.SetDefault("session.limit_desktop", 2)
+	viper.SetDefault("session.limit_total", 5)   // 单用户跨全部平台合计并发上限
+	viper.SetDefault("session.limit_desktop", 2) // 平台闸门：>0=允许，0=禁止该平台（数值不再作分平台上限）
 	viper.SetDefault("session.limit_mobile", 2)
 	viper.SetDefault("session.limit_web", 2) // 默认不禁 web（官网挂着 Web 版 app）；设 0 可禁
 	viper.SetDefault("session.max_failures", 5)
@@ -48,6 +48,9 @@ func (h *AuthHandler) Login(c *gin.Context) {
 			status = http.StatusTooManyRequests
 		} else if errors.Is(err, service.ErrPlatformNotAllowed) {
 			status = http.StatusForbidden
+		} else if errors.Is(err, service.ErrDeviceLimitReached) {
+			c.JSON(http.StatusConflict, gin.H{"error": err.Error(), "code": "DEVICE_LIMIT"})
+			return
 		}
 		c.JSON(status, gin.H{"error": err.Error()})
 		return
@@ -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
@@ -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")
@@ -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)
@@ -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))
+}
@@ -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,
@@ -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))
 }
@@ -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})
 }
@@ -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")
@@ -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"`
@@ -22,6 +22,7 @@ var (
 	ErrUserInactive       = errors.New("user is disabled")
 	ErrLicenseLocked      = errors.New("license locked, please renew or contact support")
 	ErrPlatformNotAllowed = errors.New("该平台不允许登录")
+	ErrDeviceLimitReached = errors.New("已达到登录设备上限，请提升额度或下线其他设备后重试")
 	ErrTooManyAttempts    = errors.New("登录失败次数过多，账号已临时锁定，请稍后再试")
 	ErrSessionRevoked     = errors.New("session revoked")

@@ -186,32 +187,31 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
 	// 的 lic_exp 带上新试用到期日。
 	s.ensureTrialOnFirstUse(shop.ID)

-	// 按平台类限并发：取有效配额，0=禁止该平台，超额则踢最旧会话腾位。
+	// 平台闸门：配额 0=禁止该平台登录（如禁 web）；数值不再作分平台上限，并发统一按总数限。
 	pclass := model.PlatformClass(dev.Platform)
-	quota := s.effectiveQuota(&shop, pclass)
-	if quota <= 0 {
+	if s.effectiveQuota(&shop, pclass) <= 0 {
 		s.recordLoginAttempt(shopCode, username, dev, false, "platform_not_allowed")
 		return nil, nil, ErrPlatformNotAllowed
 	}
+	// 总并发上限：同一用户跨全部平台合计不超过 totalQuota。已满时拒绝本次登录（不再
+	// 静默踢最旧），让用户自行下线其他设备或提升额度。
+	totalQuota := s.effectiveTotalQuota(&shop)

 	sid := uuid.New().String()
 	jti := uuid.New().String() // 初始 refresh token jti，后续每次续期轮换
 	now := time.Now()
 	if err := s.db.Transaction(func(tx *gorm.DB) error {
-		// 统计该 user 在该 class 的活跃会话；超额踢最旧
-		var active []model.UserSession
-		if err := tx.Set("gorm:query_option", "FOR UPDATE").
-			Where("shop_id = ? AND user_id = ? AND platform_class = ? AND revoked_at IS NULL",
-				shop.ID, user.ID, pclass).
-			Order("last_seen_at ASC").Find(&active).Error; err != nil {
+		// 统计该 user 全部平台的活跃会话（不分平台类）；已达上限则拒绝
+		var activeCount int64
+		if err := tx.Model(&model.UserSession{}).
+			Set("gorm:query_option", "FOR UPDATE").
+			Where("shop_id = ? AND user_id = ? AND revoked_at IS NULL",
+				shop.ID, user.ID).
+			Count(&activeCount).Error; err != nil {
 			return err
 		}
-		// 需要腾出 (active+1) - quota 个位置
-		for i := 0; i <= len(active)-quota; i++ {
-			if err := tx.Model(&model.UserSession{}).Where("id = ?", active[i].ID).
-				Updates(map[string]interface{}{"revoked_at": now, "revoked_reason": "kicked"}).Error; err != nil {
-				return err
-			}
+		if activeCount >= int64(totalQuota) {
+			return ErrDeviceLimitReached
 		}

 		sess := model.UserSession{
@@ -233,6 +233,9 @@ func (s *AuthService) Login(shopCode, username, password string, dev DeviceInfo)
 		}
 		return tx.Model(&model.User{}).Where("id = ?", user.ID).Update("last_login_at", now).Error
 	}); err != nil {
+		if errors.Is(err, ErrDeviceLimitReached) {
+			s.recordLoginAttempt(shopCode, username, dev, false, "device_limit")
+		}
 		return nil, nil, err
 	}

@@ -264,7 +267,35 @@ func (s *AuthService) recordLoginAttempt(shopCode, username string, dev DeviceIn
 	}
 }

-// effectiveQuota 返回某店某平台类的有效并发配额：优先每店 session_policy 覆盖，否则全局默认。
+// effectiveTotalQuota 返回某店「单用户跨全部平台」的有效并发总配额：优先每店
+// session_policy["total"] 覆盖，否则全局默认 config.C.Session.LimitTotal。至少为 1，
+// 避免误配 0 时把所有会话踢光。
+func (s *AuthService) effectiveTotalQuota(shop *model.Shop) int {
+	q := config.C.Session.LimitTotal
+	if shop.CustomFields != nil {
+		if raw, ok := shop.CustomFields["session_policy"]; ok {
+			if policy, ok := raw.(map[string]interface{}); ok {
+				switch n := policy["total"].(type) {
+				case float64:
+					if int(n) > 0 {
+						q = int(n)
+					}
+				case int:
+					if n > 0 {
+						q = n
+					}
+				}
+			}
+		}
+	}
+	if q < 1 {
+		q = 1
+	}
+	return q
+}
+
+// effectiveQuota 返回某店某平台类的平台闸门值：>0=允许该平台，0=禁止。优先每店
+// session_policy 覆盖，否则全局默认。注意：数值大小不再作分平台并发上限（已统一为总数）。
 func (s *AuthService) effectiveQuota(shop *model.Shop, pclass string) int {
 	def := map[string]int{
 		"desktop": config.C.Session.LimitDesktop,
@@ -11,9 +11,13 @@ import (
 	"github.com/wangjia/jiu/backend/testutil"
 )

-// 同平台类超配额时踢掉最旧会话。
-func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
+// 达到总配额时拒绝新登录（不踢最旧），已有会话保持在线。
+func TestLogin_TotalQuota_RejectsWhenFull(t *testing.T) {
 	db := testutil.SetupTestDB()
+	old := config.C.Session.LimitTotal
+	config.C.Session.LimitTotal = 2
+	defer func() { config.C.Session.LimitTotal = old }()
+
 	shop := testutil.CreateTestShop(db, "SESS01")
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)
@@ -23,38 +27,43 @@ func TestLogin_PerClassQuota_KicksOldest(t *testing.T) {
 	require.NoError(t, err)
 	p2, _, err := svc.Login("SESS01", "admin", "password123", dev)
 	require.NoError(t, err)
-	// 配额 2，第 3 次桌面端登录应踢掉最旧（p1）
+	// 总配额 2 已满，第 3 次登录应被拒绝
 	_, _, err = svc.Login("SESS01", "admin", "password123", dev)
-	require.NoError(t, err)
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)

-	// 共 2 个未撤销会话
+	// 仍为 2 个未撤销会话，两者都未被踢
 	var active int64
 	db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
 	assert.Equal(t, int64(2), active)
-
-	// p1 的 refresh 应失败（会话被踢）
 	_, err = svc.RefreshTokens(p1.RefreshToken)
-	assert.ErrorIs(t, err, ErrSessionRevoked)
-	// p2 仍可续期
+	assert.NoError(t, err)
 	_, err = svc.RefreshTokens(p2.RefreshToken)
 	assert.NoError(t, err)
 }

-// 移动端与桌面端配额互不影响。
-func TestLogin_QuotaIsolatedByClass(t *testing.T) {
+// 总配额跨全部平台合并计数：不同平台类共用一个总上限，满额即拒。
+func TestLogin_TotalQuota_CountsAcrossClasses(t *testing.T) {
 	db := testutil.SetupTestDB()
+	old := config.C.Session.LimitTotal
+	config.C.Session.LimitTotal = 2
+	defer func() { config.C.Session.LimitTotal = old }()
+
 	shop := testutil.CreateTestShop(db, "SESS02")
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)

+	// 桌面 + 移动 占满总配额 2
 	_, _, err := svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "windows"})
 	require.NoError(t, err)
 	_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "android"})
 	require.NoError(t, err)
+	// 第三个不同平台（web）应被总配额拒绝
+	_, _, err = svc.Login("SESS02", "admin", "password123", DeviceInfo{Platform: "web"})
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)

 	var active int64
 	db.Model(&model.UserSession{}).Where("shop_id = ? AND revoked_at IS NULL", shop.ID).Count(&active)
-	assert.Equal(t, int64(2), active) // 桌面 1 + 移动 1，都没被踢
+	assert.Equal(t, int64(2), active) // 仅前两个在线
 }

 // 配额为 0 的平台拒绝登录（如禁 web）。
@@ -72,24 +81,23 @@ func TestLogin_PlatformDisabled(t *testing.T) {
 	assert.ErrorIs(t, err, ErrPlatformNotAllowed)
 }

-// 每店 session_policy 覆盖全局默认。
+// 每店 session_policy["total"] 覆盖全局总配额默认。
 func TestLogin_PerShopPolicyOverride(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SESS04")
-	// 该店限桌面 1
+	// 该店总配额限 1
 	db.Model(&model.Shop{}).Where("id = ?", shop.ID).
-		Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"desktop": float64(1)}})
+		Update("custom_fields", model.JSON{"session_policy": map[string]interface{}{"total": float64(1)}})
 	testutil.CreateTestUser(db, shop.ID, "admin", "password123", "admin")
 	svc := NewAuthService(db)

 	p1, _, err := svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
 	require.NoError(t, err)
-	_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "windows"})
-	require.NoError(t, err)
-
-	// 第 2 次登录应把 p1 踢掉（配额 1）
+	// 总配额 1 已满，第 2 次登录（不同平台）应被拒绝，p1 保持在线
+	_, _, err = svc.Login("SESS04", "admin", "password123", DeviceInfo{Platform: "android"})
+	assert.ErrorIs(t, err, ErrDeviceLimitReached)
 	_, err = svc.RefreshTokens(p1.RefreshToken)
-	assert.ErrorIs(t, err, ErrSessionRevoked)
+	assert.NoError(t, err)
 }

 // 被禁用用户无法用 refresh token 续命（修复历史漏洞）。
@@ -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
 			}

@@ -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")
@@ -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")
 }
@@ -28,6 +28,7 @@ func InitConfig() {
 			RefreshExpireH:  168,
 		},
 		Session: config.SessionConfig{
+			LimitTotal:    5,
 			LimitDesktop:  2,
 			LimitMobile:   2,
 			LimitWeb:      2,
@@ -45,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))
@@ -186,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,
@@ -553,7 +553,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -610,7 +610,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1,122 +1 @@
-{
-  "images" : [
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-20x20@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-29x29@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-40x40@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "Icon-App-60x60@3x.png",
-      "scale" : "3x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "20x20",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-20x20@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-29x29@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-40x40@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@1x.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "76x76",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
-      "idiom" : "ipad",
-      "filename" : "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
-      "filename" : "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+{"images":[{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"20x20","idiom":"iphone","filename":"Icon-App-20x20@3x.png","scale":"3x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"29x29","idiom":"iphone","filename":"Icon-App-29x29@3x.png","scale":"3x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"40x40","idiom":"iphone","filename":"Icon-App-40x40@3x.png","scale":"3x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@1x.png","scale":"1x"},{"size":"57x57","idiom":"iphone","filename":"Icon-App-57x57@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@2x.png","scale":"2x"},{"size":"60x60","idiom":"iphone","filename":"Icon-App-60x60@3x.png","scale":"3x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@1x.png","scale":"1x"},{"size":"20x20","idiom":"ipad","filename":"Icon-App-20x20@2x.png","scale":"2x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@1x.png","scale":"1x"},{"size":"29x29","idiom":"ipad","filename":"Icon-App-29x29@2x.png","scale":"2x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@1x.png","scale":"1x"},{"size":"40x40","idiom":"ipad","filename":"Icon-App-40x40@2x.png","scale":"2x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@1x.png","scale":"1x"},{"size":"50x50","idiom":"ipad","filename":"Icon-App-50x50@2x.png","scale":"2x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@1x.png","scale":"1x"},{"size":"72x72","idiom":"ipad","filename":"Icon-App-72x72@2x.png","scale":"2x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@1x.png","scale":"1x"},{"size":"76x76","idiom":"ipad","filename":"Icon-App-76x76@2x.png","scale":"2x"},{"size":"83.5x83.5","idiom":"ipad","filename":"Icon-App-83.5x83.5@2x.png","scale":"2x"},{"size":"1024x1024","idiom":"ios-marketing","filename":"Icon-App-1024x1024@1x.png","scale":"1x"}],"info":{"version":1,"author":"xcode"}}
@@ -23,7 +23,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>jiu_client</string>
+	<string>岩美酒库</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../auth/auth_state.dart';
 import '../config/app_config.dart';
+import '../config/app_constants.dart';
 import '../config/license_copy.dart';
 import '../errors/error_reporter.dart';
 import '../../providers/connectivity_provider.dart';
@@ -15,8 +16,8 @@ final _publicDio = _buildPublicDio();
 Dio _buildPublicDio() {
  final dio = Dio(BaseOptions(
    baseUrl: AppConfig.apiBaseUrl,
-    connectTimeout: const Duration(seconds: 8),
-    receiveTimeout: const Duration(seconds: 15),
+    connectTimeout: AppConstants.publicConnectTimeout,
+    receiveTimeout: AppConstants.publicReceiveTimeout,
  ));
  dio.interceptors.add(RetryInterceptor(dio));
  return dio;
@@ -102,8 +103,8 @@ class ApiClient {
    _onAuthFailed = onAuthFailed;
    _dio = Dio(BaseOptions(
      baseUrl: AppConfig.apiBaseUrl,
-      connectTimeout: const Duration(seconds: 8),
-      receiveTimeout: const Duration(seconds: 15),
+      connectTimeout: AppConstants.publicConnectTimeout,
+      receiveTimeout: AppConstants.publicReceiveTimeout,
      headers: {
        if (token != null) 'Authorization': 'Bearer $token',
      },
@@ -1,4 +1,5 @@
 import 'package:dio/dio.dart';
+import '../config/app_constants.dart';

 /// 网络层错误自动重试拦截器。
 ///
@@ -16,11 +17,7 @@ class RetryInterceptor extends Interceptor {

  RetryInterceptor(
    this.dio, {
-    this.delays = const [
-      Duration(seconds: 1),
-      Duration(seconds: 2),
-      Duration(seconds: 4),
-    ],
+    this.delays = AppConstants.retryBackoffs,
  });

  static const _attemptKey = 'retry_attempt';
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import '../config/app_config.dart';
+import '../config/app_constants.dart';

 const _kAccessToken = 'access_token';
 const _kRefreshToken = 'refresh_token';
@@ -153,8 +154,8 @@ class AuthNotifier extends StateNotifier<AuthState> {
      try {
        await Dio(BaseOptions(
          baseUrl: AppConfig.apiBaseUrl,
-          connectTimeout: const Duration(seconds: 4),
-          receiveTimeout: const Duration(seconds: 4),
+          connectTimeout: AppConstants.authProbeTimeout,
+          receiveTimeout: AppConstants.authProbeTimeout,
          headers: {'Authorization': 'Bearer $token'},
        )).post('/auth/logout');
      } catch (_) {
@@ -0,0 +1,97 @@
+/// 全局业务常量集中地。
+///
+/// 收口此前散落在各处的「业务魔数」：网络超时、轮询间隔、重试退避、输入防抖、
+/// 分页大小、业务上限等可调参数。**不**收 UI 尺寸/间距/字号等纯样式常量
+/// （那些保留在各自 widget / 主题里，离使用点最近更易维护）。
+///
+/// 新增需要复用或可能调整的业务数值时，统一加到这里，避免再写裸字面量。
+abstract final class AppConstants {
+  // ── 网络超时 ──
+  /// 未登录公共 Dio（登录/刷新）连接超时
+  static const Duration publicConnectTimeout = Duration(seconds: 8);
+
+  /// 未登录公共 Dio 读取超时
+  static const Duration publicReceiveTimeout = Duration(seconds: 15);
+
+  /// 登录态探测/轻量请求超时
+  static const Duration authProbeTimeout = Duration(seconds: 4);
+
+  /// 异常上报请求超时
+  static const Duration errorReportTimeout = Duration(seconds: 5);
+
+  /// 检查更新请求超时
+  static const Duration updateCheckTimeout = Duration(seconds: 5);
+
+  /// 连通性探测请求超时
+  static const Duration connectivityTimeout = Duration(seconds: 15);
+
+  /// 批量导入（Excel 上传）发送超时
+  static const Duration importSendTimeout = Duration(seconds: 120);
+
+  /// 批量导入（Excel 解析入库）读取超时
+  static const Duration importReceiveTimeout = Duration(seconds: 300);
+
+  // ── 重试 / 退避 ──
+  /// 网络层错误自动重试的递增间隔（1s → 2s → 4s）
+  static const List<Duration> retryBackoffs = [
+    Duration(seconds: 1),
+    Duration(seconds: 2),
+    Duration(seconds: 4),
+  ];
+
+  /// 连通性探测的多轮预算（4s → 8s → 12s）
+  static const List<Duration> connectivityBudgets = [
+    Duration(seconds: 4),
+    Duration(seconds: 8),
+    Duration(seconds: 12),
+  ];
+
+  /// 连通性探测单轮（不重试）预算
+  static const List<Duration> connectivitySingleBudget = [Duration(seconds: 4)];
+
+  /// 连通性探测每轮失败后的退避步长（600ms × 轮次）
+  static const Duration connectivityRetryStep = Duration(milliseconds: 600);
+
+  // ── 轮询间隔 ──
+  /// 会话心跳上报间隔
+  static const Duration heartbeatInterval = Duration(seconds: 30);
+
+  /// 在线时连通性轮询间隔
+  static const Duration connectivityOnlinePoll = Duration(seconds: 30);
+
+  /// 离线时连通性轮询间隔
+  static const Duration connectivityOfflinePoll = Duration(minutes: 1);
+
+  /// 后台检查更新轮询间隔
+  static const Duration updatePollInterval = Duration(hours: 1);
+
+  /// 启动后首次检查更新前的延迟
+  static const Duration updateInitialDelay = Duration(seconds: 3);
+
+  // ── 输入防抖 / 交互延迟 ──
+  /// 下拉框失焦自动收起延迟
+  static const Duration dropdownCloseDelay = Duration(milliseconds: 150);
+
+  /// 搜索输入防抖
+  static const Duration searchDebounce = Duration(milliseconds: 300);
+
+  /// 自更新流程各步骤间的过渡延迟
+  static const Duration updaterStepDelay = Duration(milliseconds: 400);
+
+  // ── 分页 ──
+  /// 列表默认每页条数
+  static const int defaultPageSize = 20;
+
+  /// 入库选货弹窗一次性拉取的库存条数
+  static const int stockInPickerPageSize = 500;
+
+  /// 出库选货弹窗一次性拉取的库存条数
+  static const int stockOutPickerPageSize = 1000;
+
+  /// 盘点拉取库存的每页条数
+  static const int inventoryCheckPageSize = 200;
+
+  // ── 业务上限 ──
+  /// 授权未返回时的默认设备上限
+  static const int defaultMaxDevices = 3;
+}
@@ -7,6 +7,7 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:shared_preferences/shared_preferences.dart';

 import '../config/app_config.dart';
+import '../config/app_constants.dart';

 class ErrorType {
  static const flutterError = 'flutter_error';
@@ -29,8 +30,8 @@ class ErrorReporter {
  Dio get _client {
    _dio ??= Dio(BaseOptions(
      baseUrl: AppConfig.apiBaseUrl,
-      connectTimeout: const Duration(seconds: 5),
-      receiveTimeout: const Duration(seconds: 5),
+      connectTimeout: AppConstants.errorReportTimeout,
+      receiveTimeout: AppConstants.errorReportTimeout,
    ));
    return _dio!;
  }
@@ -1,6 +1,7 @@
 import 'dart:io';
 import 'package:dio/dio.dart';
 import 'package:path_provider/path_provider.dart';
+import '../config/app_constants.dart';

 // 桌面/原生平台的应用内更新实现。Web 版见 app_updater_web.dart。

@@ -34,7 +35,7 @@ Future<void> downloadAndInstall(
    await dio.download(url, exe, onReceiveProgress: prog);
    // 启动 Inno Setup 安装包后退出本应用，让其覆盖安装。
    await Process.start(exe, const [], mode: ProcessStartMode.detached);
-    await Future<void>.delayed(const Duration(milliseconds: 400));
+    await Future<void>.delayed(AppConstants.updaterStepDelay);
    exit(0);
  }

@@ -75,7 +76,7 @@ else
 fi
 ''');
    await Process.start('/bin/sh', [script], mode: ProcessStartMode.detached);
-    await Future<void>.delayed(const Duration(milliseconds: 400));
+    await Future<void>.delayed(AppConstants.updaterStepDelay);
    exit(0);
  }

@@ -1,3 +1,5 @@
+import '../core/config/app_constants.dart';
+
 class LicenseInfo {
  final int id;
  final String type; // trial | monthly | annual | lifetime
@@ -20,7 +22,8 @@ class LicenseInfo {
      id: (json['id'] as num?)?.toInt() ?? 0,
      type: json['type'] as String? ?? 'trial',
      isActive: json['is_active'] as bool? ?? false,
-      maxDevices: (json['max_devices'] as num?)?.toInt() ?? 3,
+      maxDevices:
+          (json['max_devices'] as num?)?.toInt() ?? AppConstants.defaultMaxDevices,
      expiresAt: json['expires_at'] != null
          ? DateTime.tryParse(json['expires_at'] as String)
          : null,
@@ -2,6 +2,7 @@ import 'dart:async';
 import 'package:dio/dio.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/config/app_config.dart';
+import '../core/config/app_constants.dart';

 /// 每次从离线恢复到在线时自增。
 /// 数据 provider 通过 watch 此值实现网络恢复后自动刷新。
@@ -44,27 +45,25 @@ class ConnectivityNotifier extends StateNotifier<bool> {
  // 独立轻量 Dio：无拦截器。连接预算用 Future.timeout 逐次控制，
  // 故 BaseOptions 超时放宽到 15s 作为兜底。
  final _dio = Dio(BaseOptions(
-    connectTimeout: const Duration(seconds: 15),
-    receiveTimeout: const Duration(seconds: 15),
+    connectTimeout: AppConstants.connectivityTimeout,
+    receiveTimeout: AppConstants.connectivityTimeout,
  ));

  /// 每次尝试的超时预算，逐次拉长（越来越长）。
-  static const _budgets = <Duration>[
-    Duration(seconds: 4),
-    Duration(seconds: 8),
-    Duration(seconds: 12),
-  ];
+  static const _budgets = AppConstants.connectivityBudgets;

-  /// 在线时：每 30 秒轻量检测一次（单次，不重试）
+  /// 在线时：轻量检测一次（单次，不重试）
  void _startOnlineTimer() {
    _timer?.cancel();
-    _timer = Timer.periodic(const Duration(seconds: 30), (_) => _check());
+    _timer =
+        Timer.periodic(AppConstants.connectivityOnlinePoll, (_) => _check());
  }

-  /// 离线时：每 1 分钟嗅探一次，降低频率节省资源
+  /// 离线时：降低频率嗅探，节省资源
  void _startOfflineTimer() {
    _timer?.cancel();
-    _timer = Timer.periodic(const Duration(minutes: 1), (_) => _check());
+    _timer =
+        Timer.periodic(AppConstants.connectivityOfflinePoll, (_) => _check());
  }

  /// 立即触发一次检测（供外部调用，如 API 请求失败 / 启动时）。单次，不重试。
@@ -92,14 +91,14 @@ class ConnectivityNotifier extends StateNotifier<bool> {

  /// 连通性检测。[withRetry]=true 时按 [_budgets] 退避重试，间隔递增。
  Future<bool> _check({bool withRetry = false}) async {
-    final budgets = withRetry ? _budgets : const [Duration(seconds: 4)];
+    final budgets = withRetry ? _budgets : AppConstants.connectivitySingleBudget;
    var ok = false;
    for (var i = 0; i < budgets.length; i++) {
      ok = await _ping(budgets[i]);
      if (ok) break;
      // 最后一次失败后不再等待；中间失败按递增间隔退避（0.6s, 1.2s…）
      if (i < budgets.length - 1) {
-        await Future.delayed(Duration(milliseconds: 600 * (i + 1)));
+        await Future.delayed(AppConstants.connectivityRetryStep * (i + 1));
      }
    }

@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/finance.dart';
 import '../repositories/finance_repository.dart';
@@ -16,7 +17,7 @@ final financeListProvider =

 class FinanceListNotifier extends AsyncNotifier<PageResult<FinanceRecord>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  String _type = '';
  String _month = '';

@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/inventory.dart';
 import '../repositories/inventory_repository.dart';
@@ -17,7 +18,7 @@ final inventoryListProvider =

 class InventoryListNotifier extends AsyncNotifier<PageResult<Inventory>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  int? _warehouseId;
  String _keyword = '';
  List<String> _series = [];
@@ -106,7 +107,7 @@ final inventoryLogProvider =

 class InventoryLogNotifier extends AsyncNotifier<PageResult<InventoryLog>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  PageResult<InventoryLog>? _cache;

  @override
@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/partner.dart';
 import '../repositories/partner_repository.dart';
@@ -25,7 +26,7 @@ final customerListProvider =
 class PartnerListNotifier extends AsyncNotifier<PageResult<Partner>> {
  final String? type;
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  String _keyword = '';
  PageResult<Partner>? _cache;

@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/product.dart';
 import '../repositories/product_repository.dart';
@@ -17,7 +18,7 @@ final productListProvider =

 class ProductListNotifier extends AsyncNotifier<PageResult<Product>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  String _keyword = '';
  int? _categoryId;
  PageResult<Product>? _cache;
@@ -3,6 +3,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import 'license_provider.dart';

 /// 登录态心跳：已登录时每 30s 执行一次 **单个** POST /auth/ping：
@@ -27,7 +28,7 @@ class SessionHeartbeat {

  void start() {
    _timer?.cancel();
-    _timer = Timer.periodic(const Duration(seconds: 30), (_) => _ping());
+    _timer = Timer.periodic(AppConstants.heartbeatInterval, (_) => _ping());
  }

  Future<void> _ping() async {
@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/stock_in.dart';
 import '../repositories/stock_in_repository.dart';
@@ -18,10 +19,11 @@ final stockInListProvider =

 class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  String _status = '';
  String? _startDate;
  String? _endDate;
+  String _keyword = '';
  PageResult<StockInOrder>? _cache;

  @override
@@ -43,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,
        );
@@ -59,6 +62,9 @@ class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
    reload();
  }

+  /// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
+  String get currentStatus => _status;
+
  void setStatus(String status) {
    _status = status;
    _page = 1;
@@ -72,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) {
@@ -1,6 +1,7 @@
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../core/api/api_client.dart';
 import '../core/auth/auth_state.dart';
+import '../core/config/app_constants.dart';
 import '../core/models/page_result.dart';
 import '../models/stock_out.dart';
 import '../repositories/stock_out_repository.dart';
@@ -18,10 +19,11 @@ final stockOutListProvider =

 class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
  String _status = '';
  String? _startDate;
  String? _endDate;
+  String _keyword = '';
  PageResult<StockOutOrder>? _cache;

  @override
@@ -43,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,
        );
@@ -59,6 +62,9 @@ class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
    reload();
  }

+  /// 当前服务端状态过滤值（供页面进入时对齐标签/下拉，避免重复拉取）
+  String get currentStatus => _status;
+
  void setStatus(String status) {
    _status = status;
    _page = 1;
@@ -72,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) {
@@ -7,6 +7,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../core/config/app_config.dart';
+import '../core/config/app_constants.dart';

 // ── 数据模型 ────────────────────────────────────────────────
 class AppUpdateInfo {
@@ -40,8 +41,8 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
  bool _dismissed = false; // 用户已手动关闭非强制更新提示

  final _dio = Dio(BaseOptions(
-    connectTimeout: const Duration(seconds: 5),
-    receiveTimeout: const Duration(seconds: 5),
+    connectTimeout: AppConstants.updateCheckTimeout,
+    receiveTimeout: AppConstants.updateCheckTimeout,
  ));

  @override
@@ -51,12 +52,12 @@ class UpdateNotifier extends AsyncNotifier<AppUpdateInfo?> {
      _dio.close(force: true);
    });

-    // 启动后 3 秒延迟首次检查（避免与登录请求竞争）
-    await Future.delayed(const Duration(seconds: 3));
+    // 启动后延迟首次检查（避免与登录请求竞争）
+    await Future.delayed(AppConstants.updateInitialDelay);
    final result = await _check();

-    // 每小时检查一次
-    _timer = Timer.periodic(const Duration(hours: 1), (_) async {
+    // 定期检查更新
+    _timer = Timer.periodic(AppConstants.updatePollInterval, (_) async {
      _dismissed = false;
      final r = await _check();
      state = AsyncValue.data(r);
@@ -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(
@@ -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(
@@ -8,6 +8,7 @@ import 'package:go_router/go_router.dart';
 import 'package:url_launcher/url_launcher.dart';
 import '../../core/auth/auth_state.dart';
 import '../../core/config/app_config.dart';
+import '../../core/config/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/storage/login_history.dart';
 import '../../providers/connectivity_provider.dart';
@@ -73,7 +74,8 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
      } else {
        // 延迟关闭：让候选词的 onTap（pointer-up）先执行，再关闭下拉框
        _closeHotelTimer?.cancel();
-        _closeHotelTimer = Timer(const Duration(milliseconds: 150), _closeHotel);
+        _closeHotelTimer =
+            Timer(AppConstants.dropdownCloseDelay, _closeHotel);
      }
    });
    _usernameFocus.addListener(() {
@@ -88,9 +90,38 @@ class _LoginScreenState extends ConsumerState<LoginScreen> {
        });
      } else {
        _closeUsernameTimer?.cancel();
-        _closeUsernameTimer = Timer(const Duration(milliseconds: 150), _closeUsername);
+        _closeUsernameTimer =
+            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 {
@@ -343,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);
        });
      }
    });
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../core/responsive/responsive.dart';
+import '../../core/config/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../models/finance.dart';
 import '../../providers/finance_provider.dart';
@@ -49,7 +50,7 @@ class _FinanceTab extends ConsumerStatefulWidget {
 class _FinanceTabState extends ConsumerState<_FinanceTab> {
  late String _month;
  int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;

  late Future<List<FinanceRecord>> _future;
  List<FinanceRecord> _allRecords = [];
@@ -5,6 +5,7 @@ import 'package:go_router/go_router.dart';
 import '../../core/theme/app_theme.dart';
 import '../../models/inventory.dart';
 import '../../models/warehouse.dart';
+import '../../core/config/app_constants.dart';
 import '../../providers/inventory_provider.dart';
 import '../../providers/warehouse_provider.dart';

@@ -51,7 +52,8 @@ class _InventoryCheckScreenState extends ConsumerState<InventoryCheckScreen> {
    try {
      final result = await ref
          .read(inventoryRepositoryProvider)
-          .listInventory(warehouseId: wh.id, pageSize: 200);
+          .listInventory(
+              warehouseId: wh.id, pageSize: AppConstants.inventoryCheckPageSize);
      final items = result.data
          .where((inv) => inv.productId != null)
          .map((inv) => _CheckItem(inventory: inv))
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 import '../../core/config/app_config.dart';
+import '../../core/config/app_constants.dart';
 import '../../core/responsive/responsive.dart';
 import '../../core/theme/app_theme.dart';
 import '../../models/inventory.dart';
@@ -165,8 +166,8 @@ class _InventoryListScreenState extends ConsumerState<InventoryListScreen> {
    final token = ref.read(authStateProvider).user?.accessToken ?? '';
    final dio = Dio(BaseOptions(
      baseUrl: AppConfig.apiBaseUrl,
-      sendTimeout: const Duration(seconds: 120),
-      receiveTimeout: const Duration(seconds: 300),
+      sendTimeout: AppConstants.importSendTimeout,
+      receiveTimeout: AppConstants.importReceiveTimeout,
    ));
    dio.options.headers['Authorization'] = 'Bearer $token';

@@ -676,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(),
+                            ),
                          ],
                        ),
                      ],
@@ -711,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(),
                    ],
                  );
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../core/models/page_result.dart';
 import '../../core/responsive/responsive.dart';
+import '../../core/config/app_constants.dart';
 import '../../core/theme/app_theme.dart';
 import '../../models/partner.dart';
 import '../../providers/partner_provider.dart';
@@ -77,7 +78,7 @@ class _PartnersScreenState extends ConsumerState<PartnersScreen> {
        searchCtrl: _supplierSearchCtrl,
        onSearchChanged: (v) {
          _supplierDebounce?.cancel();
-          _supplierDebounce = Timer(const Duration(milliseconds: 300), () {
+          _supplierDebounce = Timer(AppConstants.searchDebounce, () {
            ref.read(supplierListProvider.notifier).setKeyword(v);
          });
        },
@@ -120,7 +121,7 @@ class _PartnersScreenState extends ConsumerState<PartnersScreen> {
        searchCtrl: _customerSearchCtrl,
        onSearchChanged: (v) {
          _customerDebounce?.cancel();
-          _customerDebounce = Timer(const Duration(milliseconds: 300), () {
+          _customerDebounce = Timer(AppConstants.searchDebounce, () {
            ref.read(customerListProvider.notifier).setKeyword(v);
          });
        },
@@ -11,6 +11,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import '../../core/auth/auth_state.dart';
 import '../../widgets/write_guard.dart';
 import '../../core/config/app_config.dart';
+import '../../core/config/app_constants.dart';
 import '../../core/config/app_info.dart';
 import '../../core/config/license_copy.dart';
 import '../../core/responsive/responsive.dart';
@@ -1375,8 +1376,8 @@ class _BatchImportWidgetState extends ConsumerState<_BatchImportWidget> {

    final dio = Dio(BaseOptions(
      baseUrl: AppConfig.apiBaseUrl,
-      sendTimeout: const Duration(seconds: 120),
-      receiveTimeout: const Duration(seconds: 300),
+      sendTimeout: AppConstants.importSendTimeout,
+      receiveTimeout: AppConstants.importReceiveTimeout,
    ));
    dio.options.headers['Authorization'] = 'Bearer $token';

@@ -8,9 +8,9 @@ import '../../core/auth/auth_state.dart';
 import '../../core/utils/print_util.dart';
 import '../../core/utils/date_util.dart';
 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';
@@ -196,7 +196,9 @@ class _StockInFormScreenState extends ConsumerState<StockInFormScreen> {
    try {
      final result = await ref
          .read(inventoryRepositoryProvider)
-          .listInventory(warehouseId: warehouseId, pageSize: 500);
+          .listInventory(
+              warehouseId: warehouseId,
+              pageSize: AppConstants.stockInPickerPageSize);
      setState(() {
        _inventoryMap = {
          for (final inv in result.data.where((inv) => inv.productId != null))
@@ -303,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;
      }
    }

@@ -364,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,
@@ -601,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(),
                                        ),
                                      ),
                                    ),
@@ -630,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(),
                                        ),
                                      ),
                                    ),
@@ -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';

@@ -48,8 +49,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
    ColDef('warehouse', '仓库'),
    ColDef('amount', '金额', minWidth: 800),
    ColDef('status', '状态'),
-    ColDef('date', '日期', minWidth: 900),
-    ColDef('reviewed_at', '入库时间', minWidth: 900),
+    ColDef('date', '入库时间', minWidth: 900),
    ColDef('operator', '入库员', minWidth: 1100),
    ColDef('reviewer', '审核员', minWidth: 1100),
    ColDef('actions', '操作', required: true),
@@ -61,8 +61,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 +106,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 +147,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;
        }
@@ -242,12 +269,6 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
          return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
        case 'date':
          return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
-        case 'reviewed_at':
-          return DataCell(Text(o.reviewedAt != null
-              ? o.reviewedAt!.length >= 16
-                  ? o.reviewedAt!.substring(0, 16)
-                  : o.reviewedAt!.substring(0, 10)
-              : '-'));
        case 'operator':
          return DataCell(Text(o.operatorName ?? '-',
              style: const TextStyle(fontSize: 13)));
@@ -334,6 +355,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 +398,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 +435,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 +463,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
                ColumnPrefs.save(_screenId, v);
              },
            ),
+            refreshBtn,
          ],
        );
      }),
@@ -490,7 +543,7 @@ class _StockInListScreenState extends ConsumerState<StockInListScreen> {
            o.totalAmount != null
                ? '¥${o.totalAmount!.toStringAsFixed(2)}'
                : '-'),
-        MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
+        MobileCardField('入库时间', o.orderDate?.substring(0, 10) ?? '-'),
      ],
      actions: _orderActions(context, o),
    );
@@ -1041,6 +1094,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))),
          ],
@@ -9,6 +9,8 @@ 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';
 import '../../providers/stock_out_provider.dart';
@@ -153,7 +155,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
    try {
      final result = await ref
          .read(inventoryRepositoryProvider)
-          .listInventory(warehouseId: warehouseId, pageSize: 1000);
+          .listInventory(
+              warehouseId: warehouseId,
+              pageSize: AppConstants.stockOutPickerPageSize);
      final Map<int, _PickerItem> productMap = {};
      for (final inv in result.data.where((inv) => inv.productId != null)) {
        final pid = inv.productId!;
@@ -495,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(),
                                        ),
                                      ),
                                    ),
@@ -523,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(),
                                        ),
                                      ),
                                    ),
@@ -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 = [
@@ -55,14 +64,23 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
    ColDef('warehouse', '仓库'),
    ColDef('amount', '金额', minWidth: 800),
    ColDef('status', '状态'),
-    ColDef('date', '日期', minWidth: 900),
-    ColDef('reviewed_at', '出库时间', minWidth: 900),
+    ColDef('date', '出库时间', minWidth: 900),
    ColDef('created_at', '创建时间', minWidth: 900),
    ColDef('operator', '出库员', minWidth: 1100),
    ColDef('reviewer', '审核员', minWidth: 1100),
    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 +107,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 +148,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;
        }
@@ -242,12 +270,6 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
          return DataCell(StatusBadge(_apiStatusToEnum(o.status)));
        case 'date':
          return DataCell(Text(o.orderDate?.substring(0, 10) ?? '-'));
-        case 'reviewed_at':
-          return DataCell(Text(o.reviewedAt != null
-              ? o.reviewedAt!.length >= 16
-                  ? o.reviewedAt!.substring(0, 16)
-                  : o.reviewedAt!.substring(0, 10)
-              : '-'));
        case 'created_at':
          return DataCell(Text(o.createdAt != null
              ? o.createdAt!.length >= 16
@@ -340,6 +362,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 +405,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 +442,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 +470,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
                ColumnPrefs.save(_screenId, v);
              },
            ),
+            refreshBtn,
          ],
        );
      }),
@@ -463,7 +517,7 @@ class _StockOutListScreenState extends ConsumerState<StockOutListScreen> {
            o.totalAmount != null
                ? '¥${o.totalAmount!.toStringAsFixed(2)}'
                : '-'),
-        MobileCardField('日期', o.orderDate?.substring(0, 10) ?? '-'),
+        MobileCardField('出库时间', o.orderDate?.substring(0, 10) ?? '-'),
      ],
      actions: _orderActions(context, o),
    );
@@ -950,6 +1004,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))),
          ],
@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import '../core/theme/app_theme.dart';
 import '../core/utils/date_util.dart';

-/// 年/月/日 三个可编辑下拉框的日期选择组件，替代原生 showDatePicker。
+/// 可键入日期框 + 日历图标（替代旧的「年/月/日」三下拉）。
 ///
-/// - 每个下拉是 Material 3 `DropdownMenu`：点开可选，键入数字即过滤定位
-///   （年/月/日均为有界域，条目覆盖全范围，等价于「手动输入数字」）。
-/// - 改月/年时把超出当月的「日」自动 clamp 回当月最大值。
-/// - 值以 `yyyy-MM-dd` 字符串进出（[value] / [onChanged]）；三者未填齐时回调 null。
+/// - **直接键入**：支持「2024」「2024-5」「2024-5-12」「20240512」等，归一为 `yyyy-MM-dd`，
+///   缺的月/日补 `01`（老酒只知道年份，填 2024 即 2024-01-01）。失焦时把显示归一化。
+/// - **日历图标**：弹 Material `showDatePicker`（input 模式可直接键入年份，选老年份方便）。
+/// - 值以 `yyyy-MM-dd` 字符串进出（[value] / [onChanged]）；无有效年时回调 null。
 class DatePickerField extends StatefulWidget {
  final String? value; // yyyy-MM-dd
  final ValueChanged<String?> onChanged;
@@ -27,151 +27,130 @@ class DatePickerField extends StatefulWidget {
 }

 class _DatePickerFieldState extends State<DatePickerField> {
-  int? _year;
-  int? _month;
-  int? _day;
+  late final TextEditingController _ctrl;
+  final FocusNode _focus = FocusNode();

  @override
  void initState() {
    super.initState();
-    _parse(widget.value);
+    _ctrl = TextEditingController(text: widget.value ?? '');
+    _focus.addListener(() {
+      // 失焦时把输入归一化显示（如 2024 → 2024-01-01）
+      if (!_focus.hasFocus) {
+        final n = _normalize(_ctrl.text);
+        if (n != null && n != _ctrl.text) {
+          _ctrl.text = n;
+        }
+      }
+    });
  }

  @override
  void didUpdateWidget(DatePickerField old) {
    super.didUpdateWidget(old);
-    if (old.value != widget.value) {
-      _parse(widget.value);
+    // 仅在无焦点（非用户正在输入）时同步外部值，避免回流打断输入
+    if (!_focus.hasFocus &&
+        old.value != widget.value &&
+        (widget.value ?? '') != _ctrl.text) {
+      _ctrl.text = widget.value ?? '';
    }
  }

-  void _parse(String? v) {
-    final d = parseYmd(v);
-    _year = d?.year;
-    _month = d?.month;
-    _day = d?.day;
+  @override
+  void dispose() {
+    _ctrl.dispose();
+    _focus.dispose();
+    super.dispose();
  }

-  int get _daysInMonth {
-    final y = _year ?? DateTime.now().year;
-    final m = _month ?? 1;
-    return DateTime(y, m + 1, 0).day; // 下月第 0 天 = 当月最后一天
-  }
-
-  String? get _composed => composeYmd(_year, _month, _day);
-
-  void _emit(FormFieldState<String> field) {
-    // 改月/年后把超界的日 clamp 回当月最大值（与 composeYmd 一致，State 同步显示）
-    if (_day != null && _day! > _daysInMonth) {
-      _day = _daysInMonth;
+  /// 归一用户输入为 `yyyy-MM-dd`（缺月/日补 01）；无有效年返回 null。
+  static String? _normalize(String raw) {
+    final s = raw.trim();
+    if (s.isEmpty) return null;
+    int? y, mo, d;
+    if (RegExp(r'^[0-9]+$').hasMatch(s)) {
+      // 纯数字串：yyyymmdd / yyyymm / yyyy
+      if (s.length >= 8) {
+        y = int.tryParse(s.substring(0, 4));
+        mo = int.tryParse(s.substring(4, 6));
+        d = int.tryParse(s.substring(6, 8));
+      } else if (s.length == 6) {
+        y = int.tryParse(s.substring(0, 4));
+        mo = int.tryParse(s.substring(4, 6));
+      } else {
+        y = int.tryParse(s);
+      }
+    } else {
+      final parts =
+          s.split(RegExp(r'[^0-9]+')).where((e) => e.isNotEmpty).toList();
+      if (parts.isNotEmpty) y = int.tryParse(parts[0]);
+      if (parts.length >= 2) mo = int.tryParse(parts[1]);
+      if (parts.length >= 3) d = int.tryParse(parts[2]);
+    }
+    if (y == null || y < 1900 || y > 2200) return null;
+    mo ??= 1;
+    d ??= 1;
+    if (mo < 1 || mo > 12) return null;
+    final maxDay = DateTime(y, mo + 1, 0).day;
+    if (d < 1) d = 1;
+    if (d > maxDay) d = maxDay;
+    return '${y.toString().padLeft(4, '0')}-'
+        '${mo.toString().padLeft(2, '0')}-'
+        '${d.toString().padLeft(2, '0')}';
+  }
+
+  Future<void> _pickFromCalendar(FormFieldState<String> field) async {
+    final init =
+        parseYmd(_normalize(_ctrl.text) ?? widget.value) ?? DateTime.now();
+    final picked = await showDatePicker(
+      context: context,
+      initialDate: init,
+      firstDate: DateTime(1900),
+      lastDate: DateTime(2200),
+      initialEntryMode: DatePickerEntryMode.input,
+    );
+    if (picked != null) {
+      final v = formatYmd(picked);
+      _ctrl.text = v;
+      field.didChange(v);
+      widget.onChanged(v);
    }
-    final v = _composed;
-    field.didChange(v);
-    widget.onChanged(v);
-    setState(() {});
  }

  @override
  Widget build(BuildContext context) {
-    final now = DateTime.now();
-    final years = [for (var y = now.year - 20; y <= now.year + 5; y++) y];
-    final months = [for (var m = 1; m <= 12; m++) m];
-    final days = [for (var d = 1; d <= _daysInMonth; d++) d];
-
-    // 每个下拉用 Expanded 撑满分得的宽度（expandedInsets:zero 让 DropdownMenu 填满父级），
-    // trailingIcon 用紧凑小箭头，避免默认大图标按钮挤掉数字（曾导致「2026」被裁成「007」）。
-    Widget menu({
-      required String label,
-      required int? value,
-      required List<int> items,
-      required ValueChanged<int?> onSel,
-      required FormFieldState<String> field,
-    }) {
-      return DropdownMenu<int>(
-        initialSelection: value,
-        label: Text(label, style: const TextStyle(fontSize: 11)),
-        enableFilter: true,
-        requestFocusOnTap: true,
-        textStyle: const TextStyle(fontSize: 13),
-        menuHeight: 280,
-        expandedInsets: EdgeInsets.zero,
-        trailingIcon: const Icon(Icons.arrow_drop_down, size: 18),
-        selectedTrailingIcon: const Icon(Icons.arrow_drop_up, size: 18),
-        inputDecorationTheme: const InputDecorationTheme(
-          isDense: true,
-          contentPadding: EdgeInsets.symmetric(horizontal: 6, vertical: 8),
-        ),
-        dropdownMenuEntries: [
-          for (final i in items) DropdownMenuEntry<int>(value: i, label: '$i'),
-        ],
-        onSelected: onSel,
-      );
-    }
-
    return FormField<String>(
      initialValue: widget.value,
      validator: widget.isRequired
-          ? (v) => (_composed == null ? '请选择日期' : null)
+          ? (_) => _normalize(_ctrl.text) == null ? '请输入日期' : null
          : null,
      builder: (field) {
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Row(
-              children: [
-                Expanded(
-                  flex: 5,
-                  child: menu(
-                    label: '年',
-                    value: _year,
-                    items: years,
-                    field: field,
-                    onSel: (v) {
-                      _year = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  flex: 4,
-                  child: menu(
-                    label: '月',
-                    value: _month,
-                    items: months,
-                    field: field,
-                    onSel: (v) {
-                      _month = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-                const SizedBox(width: 6),
-                Expanded(
-                  flex: 4,
-                  child: menu(
-                    label: '日',
-                    value: _day,
-                    items: days,
-                    field: field,
-                    onSel: (v) {
-                      _day = v;
-                      _emit(field);
-                    },
-                  ),
-                ),
-              ],
+        return TextField(
+          controller: _ctrl,
+          focusNode: _focus,
+          keyboardType: TextInputType.datetime,
+          style: const TextStyle(fontSize: 13),
+          decoration: InputDecoration(
+            isDense: true,
+            hintText: '年-月-日',
+            hintStyle: const TextStyle(fontSize: 12),
+            contentPadding:
+                const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+            errorText: field.errorText,
+            suffixIcon: IconButton(
+              icon: const Icon(Icons.calendar_today,
+                  size: 16, color: AppTheme.textSecondary),
+              padding: EdgeInsets.zero,
+              constraints: const BoxConstraints(minWidth: 34, minHeight: 34),
+              tooltip: '选择日期',
+              onPressed: () => _pickFromCalendar(field),
            ),
-            if (field.errorText != null)
-              Padding(
-                padding: const EdgeInsets.only(left: 12, top: 4),
-                child: Text(
-                  field.errorText!,
-                  style: const TextStyle(fontSize: 11, color: AppTheme.danger),
-                ),
-              ),
-          ],
+          ),
+          onChanged: (v) {
+            final n = _normalize(v);
+            field.didChange(n);
+            widget.onChanged(n);
+          },
        );
      },
    );
@@ -489,7 +489,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
@@ -504,7 +504,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
@@ -519,7 +519,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/jiu_client.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/jiu_client";
@@ -1,68 +1,68 @@
 {
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
+    "info": {
+        "version": 1,
+        "author": "xcode"
    },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+    "images": [
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_16.png",
+            "scale": "1x"
+        },
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "2x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "1x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_64.png",
+            "scale": "2x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_128.png",
+            "scale": "1x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "2x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "1x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "2x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "1x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_1024.png",
+            "scale": "2x"
+        }
+    ]
+}
@@ -8,7 +8,7 @@
 PRODUCT_NAME = jiu_client

 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.jiuClient
+PRODUCT_BUNDLE_IDENTIFIER = com.yanmei.jiu

 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2026 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2026 岩美技术有限公司. All rights reserved.
@@ -13,7 +13,9 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
+	<string>岩美酒库</string>
+	<key>CFBundleDisplayName</key>
+	<string>岩美酒库</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -65,6 +65,22 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "2.4.0"
+  checked_yaml:
+    dependency: transitive
+    description:
+      name: checked_yaml
+      sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.4"
+  cli_util:
+    dependency: transitive
+    description:
+      name: cli_util
+      sha256: ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.2"
  clock:
    dependency: transitive
    description:
@@ -206,6 +222,14 @@ packages:
    description: flutter
    source: sdk
    version: "0.0.0"
+  flutter_launcher_icons:
+    dependency: "direct dev"
+    description:
+      name: flutter_launcher_icons
+      sha256: "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.14.4"
  flutter_lints:
    dependency: "direct dev"
    description:
@@ -381,6 +405,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.1"
+  json_annotation:
+    dependency: transitive
+    description:
+      name: json_annotation
+      sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.12.0"
  leak_tracker:
    dependency: transitive
    description:
@@ -37,6 +37,25 @@ dev_dependencies:
    sdk: flutter
  flutter_lints: ^4.0.0
  http_mock_adapter: ^0.6.1
+  flutter_launcher_icons: ^0.14.1
+
+# 全平台启动图标，单一源图 assets/brand/logo_mark.png（512×512），
+# 跑 `dart run flutter_launcher_icons` 重生成 android/ios/web/windows/macos 所有图标
+flutter_launcher_icons:
+  image_path: "assets/brand/logo_mark.png"
+  android: true
+  ios: true
+  remove_alpha_ios: true
+  background_color_ios: "#FFFFFF"
+  web:
+    generate: true
+    background_color: "#FFFFFF"
+    theme_color: "#2563AC"
+  windows:
+    generate: true
+    icon_size: 256
+  macos:
+    generate: true

 flutter:
  uses-material-design: true
@@ -31,26 +31,47 @@ void main() {
  });

  group('DatePickerField', () {
-    testWidgets('渲染三个年/月/日下拉框', (tester) async {
+    testWidgets('渲染可键入框 + 日历图标', (tester) async {
      await tester.pumpWidget(MaterialApp(
        home: Scaffold(
          body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
        ),
      ));
      await tester.pumpAndSettle();
-      expect(find.byType(DropdownMenu<int>), findsNWidgets(3));
+      expect(find.byType(TextField), findsOneWidget);
+      expect(find.byIcon(Icons.calendar_today), findsOneWidget);
    });

-    testWidgets('初始值回显到三个下拉框', (tester) async {
+    testWidgets('初始值回显到输入框', (tester) async {
      await tester.pumpWidget(MaterialApp(
        home: Scaffold(
          body: DatePickerField(value: '2026-06-19', onChanged: (_) {}),
        ),
      ));
      await tester.pumpAndSettle();
-      expect(find.widgetWithText(DropdownMenu<int>, '2026'), findsOneWidget);
-      expect(find.widgetWithText(DropdownMenu<int>, '6'), findsOneWidget);
-      expect(find.widgetWithText(DropdownMenu<int>, '19'), findsOneWidget);
+      expect(find.text('2026-06-19'), findsOneWidget);
+    });
+
+    testWidgets('只输年份归一为 yyyy-01-01', (tester) async {
+      String? out;
+      await tester.pumpWidget(MaterialApp(
+        home: Scaffold(
+          body: DatePickerField(onChanged: (v) => out = v),
+        ),
+      ));
+      await tester.enterText(find.byType(TextField), '2024');
+      expect(out, '2024-01-01');
+    });
+
+    testWidgets('年月归一为 yyyy-MM-01', (tester) async {
+      String? out;
+      await tester.pumpWidget(MaterialApp(
+        home: Scaffold(
+          body: DatePickerField(onChanged: (v) => out = v),
+        ),
+      ));
+      await tester.enterText(find.byType(TextField), '2024-5');
+      expect(out, '2024-05-01');
    });
  });
 }
@@ -30,13 +30,13 @@
  <!-- iOS meta tags & icons -->
  <meta name="mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="岩美">
+  <meta name="apple-mobile-web-app-title" content="岩美酒库">
  <link rel="apple-touch-icon" href="icons/Icon-192.png">

  <!-- Favicon -->
  <link rel="icon" type="image/png" href="favicon.png"/>

-  <title>岩美</title>
+  <title>岩美酒库</title>
  <link rel="manifest" href="manifest.json">
 </head>
 <body>
@@ -1,6 +1,6 @@
 {
-    "name": "岩美",
-    "short_name": "岩美",
+    "name": "岩美酒库",
+    "short_name": "岩美酒库",
    "start_url": ".",
    "display": "standalone",
    "background_color": "#2563AC",
@@ -32,4 +32,4 @@
            "purpose": "maskable"
        }
    ]
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wangjia	182adca282	feat(client): 列表日期列改名入库/出库时间删审核时间列 + 日期控件改可键入框带日历 Deploy Client / build-client-web (push) Successful in 41s Details Deploy Client / build-windows (push) Successful in 2m34s Details Deploy Client / build-macos (push) Successful in 2m20s Details Deploy Client / build-android (push) Successful in 1m5s Details Deploy Client / build-ios (push) Successful in 2m44s Details Deploy Client / release-deploy-client (push) Successful in 1m26s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-21 16:39:32 +08:00
wangjia	025f3b7bbc	feat(client): 入库录入去除按名称复用，明细带产品信息由后端建独立产品 Deploy Client / build-client-web (push) Successful in 40s Details Deploy Client / build-macos (push) Successful in 2m14s Details Deploy Client / build-android (push) Successful in 1m31s Details Deploy Client / build-ios (push) Successful in 2m53s Details Deploy Client / build-windows (push) Has been cancelled Details Deploy Client / release-deploy-client (push) Has been cancelled Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-21 16:30:37 +08:00
wangjia	c1febfffec	feat(backend): 入库每行新建独立产品发独立序列号(product 加生产日期/批次列) Deploy Server / release-deploy-server (push) Successful in 59s Details 入库 Create/Update 改为对每条明细新建独立 product（createIndependentProduct， nextProductCode 自增 + uk_shop_code 唯一约束兜底），回填 product_id；不再按名称复用。 product 表加 production_date/batch_no。向后兼容：保留明细/库存快照列。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-21 16:30:11 +08:00
wangjia	b42a70ff3b	ci: 修复数据库备份 workflow——改用 mac runner、EC2 端读密码、本机落盘、每日定时 backup.yml 原 runs-on ubuntu-latest 无对应 runner、落盘 NAS 路径在 mac runner 不存在，长期跑不起来。改为 runs-on mac + scripts/ci/backup-db.sh：复用 lib-forgejo 的 ssh 封装连 EC2，在 EC2 端从 production.env 读 DSN 密码 mysqldump（零额外 secret），流回本机 ~/jiu-db-backups gzip 落盘、保留 30 天、完整性校验，恢复每日 02:00 定时 + Telegram 成败通知。 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-21 11:39:28 +08:00
wangjia	1a1d9aa15e	fix(backend): 商品编码改用最大序号生成不复用软删号 + 加 (shop_id,code) 唯一约束，根治重复编码 Deploy Server / release-deploy-server (push) Successful in 53s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-21 10:51:34 +08:00
wangjia	71ed15b40b	feat(client): 入库/出库加搜索框，入库/出库/库存加刷新按钮 Deploy Client / build-client-web (push) Successful in 42s Details Deploy Client / build-windows (push) Successful in 1m53s Details Deploy Client / build-macos (push) Successful in 2m10s Details Deploy Client / build-android (push) Successful in 1m15s Details Deploy Client / build-ios (push) Successful in 2m28s Details Deploy Client / release-deploy-client (push) Successful in 1m21s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-20 16:03:01 +08:00
wangjia	fb1e637ce4	fix(backend): 入库审核库存沿用明细真实快照名 + 库存列表过滤软删商品，修复历史导入占位顶替；入库/出库列表支持 keyword 搜索 Deploy Server / release-deploy-server (push) Successful in 53s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01YZ4DskSRKsSiheQonFtQvx	2026-06-20 16:02:02 +08:00
wangjia	7f3261a4a9	chore: release server-v1.0.66 Deploy Server / release-deploy-server (push) Successful in 51s Details fix(backend): 入库/出库列表按 order_date 倒序，历史导入单按业务日期归位 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 12:50:26 +08:00
wangjia	bcc02a2f09	chore: release client-v1.0.63 Deploy Client / build-client-web (push) Successful in 37s Details Deploy Client / build-windows (push) Successful in 2m32s Details Deploy Client / build-macos (push) Successful in 2m2s Details Deploy Client / build-android (push) Successful in 1m7s Details Deploy Client / build-ios (push) Successful in 2m31s Details Deploy Client / release-deploy-client (push) Successful in 1m33s Details fix(client): 入库/出库单状态筛选改服务端，全部状态含未审核 + 下拉补待审核 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 12:19:51 +08:00
wangjia	50b5c9fccb	chore: release server-v1.0.65 Deploy Server / release-deploy-server (push) Successful in 1m5s Details fix(backend): 入库/出库列表 status 支持多状态 IN 查询 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 12:19:46 +08:00
wangjia	648d9bc0d5	chore: release client-v1.0.62 Deploy Client / build-client-web (push) Successful in 40s Details Deploy Client / build-macos (push) Successful in 2m0s Details Deploy Client / build-android (push) Successful in 1m9s Details Deploy Client / build-ios (push) Successful in 2m30s Details Deploy Client / build-windows (push) Successful in 2m16s Details Deploy Client / release-deploy-client (push) Successful in 1m23s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 10:14:44 +08:00
wangjia	15ef71734d	chore: release server-v1.0.64 Deploy Server / release-deploy-server (push) Successful in 55s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 10:13:49 +08:00
wangjia	36c7ad8b43	chore: release client-v1.0.61 Deploy Client / build-client-web (push) Successful in 38s Details Deploy Client / build-windows (push) Successful in 1m52s Details Deploy Client / build-macos (push) Successful in 1m55s Details Deploy Client / build-android (push) Successful in 1m0s Details Deploy Client / build-ios (push) Successful in 2m47s Details Deploy Client / release-deploy-client (push) Successful in 1m21s Details Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>	2026-06-20 08:56:02 +08:00