chore: release client-v1.0.62

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.gitignore

@@ -66,3 +66,6 @@ backend/gencode
 
 # iOS 证书私钥（绝不入库）
 .ios-certs/
+
+# brainstorming visual companion
+.superpowers/

CHANGELOG-client.md

@@ -5,6 +5,32 @@ 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.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
+
+### 新功能
+- 入库/出库录单新增日期选择器，单据日期、生产日期等可直接点选，无需手动输入
+
+### 改进
+- 录单表单的商品、往来单位等可搜索下拉支持边搜边选，找不到时可内联新建选项，录单更顺手
+- 从旧系统迁入的历史进销存单据，明细可正常展示商品编号、名称、系列、规格等信息
+
 ## [1.0.59] - 2026-06-19
 
 ### 新功能

CHANGELOG-server.md

@@ -5,6 +5,17 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.64] - 2026-06-20
+
+### 改进
+- 登录设备并发限制改为「按账号统计全部平台合计」：同一账号在桌面、移动、Web 各端加起来最多同时在线 5 台设备（原先各平台分别计数）
+- 达到设备上限时，新设备登录会被明确拒绝并提示「已达到登录设备上限，请提升额度或下线其他设备后重试」，不再静默把最早登录的设备顶下线——由用户自行决定下线哪台或提升额度
+
+## [1.0.63] - 2026-06-20
+
+### 新功能
+- 入库/出库单据明细新增商品快照字段（商品编号、名称、系列、规格，出库另含批次号、生产日期）与单据制单人记录，便于完整展示从旧系统迁入、无商品主数据关联的历史进销存单据
+
 ## [1.0.62] - 2026-06-19
 
 ### 新功能

backend/cmd/import-history/main.go

@@ -0,0 +1,590 @@
+// import-history —— 一次性把旧系统导出的历史进销存数据迁入当前库。
+//
+// 设计要点（已与用户确认）：
+//   - 历史只读：in/out 单只作历史记录导入，绝不回放库存增减、绝不触碰
+//     inventories / inventory_logs。当前库存请另用现有 ImportInventory 从
+//     库存.xls 导入。
+//   - 完全忠实、不做 SKU 归一：明细的 商品编号/商品名称/系列/规格 各存为
+//     一个独立列（product_code/product_name/series/spec）。生产库 stock_*_items
+//     有 product_id→products 外键且 NOT NULL，故明细 product_id 统一指向一个
+//     占位商品（HIST-PLACEHOLDER），不按 SKU 建商品、不依赖商品主数据，展示层
+//     优先读明细自身快照列。单位 不导入。
+//   - 单据编号 作单据天然主键，(shop_id, order_no) 幂等去重，可重复跑。
+//   - 明细按 单据编号 join 表头取 order_id 外键。
+//
+// 用法（在 backend/ 目录下执行）：
+//
+//	go run ./cmd/import-history --shop-code S001 --data-dir ../data --dry-run
+//	go run ./cmd/import-history --shop-code S001 --data-dir ../data
+package main
+
+import (
+	"crypto/rand"
+	"encoding/hex"
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/xuri/excelize/v2"
+	"golang.org/x/crypto/bcrypt"
+	"gorm.io/driver/mysql"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+
+	"github.com/wangjia/jiu/backend/config"
+	"github.com/wangjia/jiu/backend/internal/model"
+)
+
+// 真实在岗人员（用户列损坏，需规整匹配）。前三位据旧系统核实，
+// 汤振宇 由 dry-run 实测发现（出现 1375 次的完好姓名，非乱码）。
+var realPeople = []struct {
+	prefix2  string // 前两个汉字，用于容损匹配（如 "丁国GSHD" → 丁国 → 丁国辉）
+	fullName string
+	username string
+}{
+	{"丁国", "丁国辉", "hist_dingguohui"},
+	{"刘春", "刘春燕", "hist_liuchunyan"},
+	{"张志", "张志磊", "hist_zhangzhilei"},
+	{"汤振", "汤振宇", "hist_tangzhenyu"},
+}
+
+func main() {
+	var (
+		shopCode = flag.String("shop-code", "", "目标门店 code（与 shop-id 二选一）")
+		shopID   = flag.Uint64("shop-id", 0, "目标门店 id（与 shop-code 二选一）")
+		dataDir  = flag.String("data-dir", "../data", "data 目录路径")
+		dryRun   = flag.Bool("dry-run", false, "只统计不写库")
+		envFile  = flag.String("env-file", "", "可选：systemd 风格 KEY=VALUE 环境文件（用于远端读取 DATABASE_DSN，自行解析避免 shell 引号问题）")
+	)
+	flag.Parse()
+
+	if *envFile != "" {
+		loadEnvFile(*envFile)
+	}
+	config.Load()
+	db, err := gorm.Open(mysql.Open(config.C.Database.DSN), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	if err != nil {
+		log.Fatalf("连接数据库失败: %v", err)
+	}
+
+	// 确保历史导入用到的新列已就位（AutoMigrate 自动加可空列，不影响现有数据）。
+	// dry-run 必须只读：跳过 AutoMigrate，绝不改动目标库表结构。
+	if !*dryRun {
+		if err := db.AutoMigrate(
+			&model.StockInOrder{}, &model.StockInItem{},
+			&model.StockOutOrder{}, &model.StockOutItem{},
+		); err != nil {
+			log.Fatalf("AutoMigrate 失败: %v", err)
+		}
+	}
+
+	// ── 解析目标门店 ──────────────────────────────────────
+	var shop model.Shop
+	switch {
+	case *shopID > 0:
+		if err := db.First(&shop, *shopID).Error; err != nil {
+			log.Fatalf("门店 id=%d 不存在: %v", *shopID, err)
+		}
+	case *shopCode != "":
+		if err := db.Where("code = ?", *shopCode).First(&shop).Error; err != nil {
+			log.Fatalf("门店 code=%s 不存在: %v", *shopCode, err)
+		}
+	default:
+		log.Fatal("必须提供 --shop-code 或 --shop-id")
+	}
+	log.Printf("目标门店: %s (code=%s, id=%d)  dry-run=%v", shop.Name, shop.Code, shop.ID, *dryRun)
+
+	// ── 默认仓库 ──────────────────────────────────────────
+	var wh model.Warehouse
+	if db.Where("shop_id = ? AND is_default = ? AND deleted_at IS NULL", shop.ID, true).First(&wh).Error != nil {
+		if db.Where("shop_id = ? AND deleted_at IS NULL", shop.ID).Order("id ASC").First(&wh).Error != nil {
+			log.Fatalf("门店 %d 无任何仓库，请先创建仓库", shop.ID)
+		}
+	}
+	log.Printf("默认仓库: %s (id=%d)", wh.Name, wh.ID)
+
+	ic := &importCtx{db: db, shopID: shop.ID, whID: wh.ID, dryRun: *dryRun}
+	ic.ensureUsers()
+	ic.ensurePlaceholderProduct()
+
+	// ── 入库 ──────────────────────────────────────────────
+	ic.importDoc(
+		filepath.Join(*dataDir, "入库单总表.xlsx"),
+		filepath.Join(*dataDir, "入库详情单总表.xlsx"),
+		true,
+	)
+	// ── 出库 ──────────────────────────────────────────────
+	ic.importDoc(
+		filepath.Join(*dataDir, "出库单总表.xlsx"),
+		filepath.Join(*dataDir, "出库详情单总表.xlsx"),
+		false,
+	)
+
+	ic.report()
+}
+
+// loadEnvFile 解析 systemd EnvironmentFile 风格的 KEY=VALUE 文件并写入进程环境。
+// 自行按首个 '=' 切分，值原样保留（不做 shell 解引号），从而安全处理 DSN 中的
+// & ( ) ? 等 shell 特殊字符。config.Load() 随后经 AutomaticEnv 读取 DATABASE_DSN。
+func loadEnvFile(path string) {
+	data, err := os.ReadFile(path)
+	if err != nil {
+		log.Fatalf("读取 env 文件 %s 失败: %v", path, err)
+	}
+	for _, line := range strings.Split(string(data), "\n") {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+		eq := strings.IndexByte(line, '=')
+		if eq <= 0 {
+			continue
+		}
+		key := strings.TrimSpace(line[:eq])
+		val := strings.TrimSpace(line[eq+1:])
+		// 去掉成对包裹的引号（若有）
+		if len(val) >= 2 && (val[0] == '"' || val[0] == '\'') && val[len(val)-1] == val[0] {
+			val = val[1 : len(val)-1]
+		}
+		_ = os.Setenv(key, val)
+	}
+}
+
+// ── 导入上下文 ───────────────────────────────────────────
+
+type importCtx struct {
+	db     *gorm.DB
+	shopID uint64
+	whID   uint64
+	dryRun bool
+
+	systemUserID         uint64
+	placeholderProductID uint64            // 历史明细统一指向的占位商品（满足 product_id 外键）
+	personToUser         map[string]uint64 // fullName → user id
+	partnerCache         map[string]*uint64
+
+	// 统计
+	statOrders   int
+	statItems    int
+	statSkipped  int // order_no 已存在跳过
+	statOrphanND int // 无明细单
+	statNoHeader int // 明细找不到表头（理论上为 0）
+	newPartners  int
+	unmatchedOps map[string]int // 未匹配到三人的人员原值 → 次数
+}
+
+func randPassword() string {
+	b := make([]byte, 16)
+	_, _ = rand.Read(b)
+	h, _ := bcrypt.GenerateFromPassword([]byte(hex.EncodeToString(b)), bcrypt.DefaultCost)
+	return string(h)
+}
+
+// ensureUsers 预置 system 兜底用户 + 三位真实人员（历史归属用，inactive）。
+func (ic *importCtx) ensureUsers() {
+	ic.personToUser = map[string]uint64{}
+	ic.partnerCache = map[string]*uint64{}
+	ic.unmatchedOps = map[string]int{}
+
+	ensure := func(username, realName, role string) uint64 {
+		var u model.User
+		if ic.db.Where("shop_id = ? AND username = ?", ic.shopID, username).First(&u).Error == nil {
+			return u.ID
+		}
+		u = model.User{
+			ShopID: ic.shopID, Username: username, RealName: realName,
+			Role: role, IsActive: false, PasswordHash: randPassword(),
+		}
+		if ic.dryRun {
+			log.Printf("[dry-run] 将建用户: %s (%s)", username, realName)
+			return 0
+		}
+		if err := ic.db.Create(&u).Error; err != nil {
+			log.Fatalf("创建用户 %s 失败: %v", username, err)
+		}
+		log.Printf("建用户: %s (%s) id=%d", username, realName, u.ID)
+		return u.ID
+	}
+
+	ic.systemUserID = ensure("hist_system", "系统导入", "operator")
+	for _, p := range realPeople {
+		ic.personToUser[p.fullName] = ensure(p.username, p.fullName, "operator")
+	}
+}
+
+// 历史明细 product_id 占位商品的固定 code。
+const placeholderProductCode = "HIST-PLACEHOLDER"
+
+// ensurePlaceholderProduct 取/建一个占位商品，历史明细的 product_id 统一指向它，
+// 用于满足 stock_*_items.product_id → products 的外键约束。展示层优先读明细
+// 自身快照列（product_name/series/spec），故该占位商品仅作引用、不参与展示。
+func (ic *importCtx) ensurePlaceholderProduct() {
+	var p model.Product
+	if ic.db.Where("shop_id = ? AND code = ? AND deleted_at IS NULL", ic.shopID, placeholderProductCode).First(&p).Error == nil {
+		ic.placeholderProductID = p.ID
+		return
+	}
+	if ic.dryRun {
+		log.Printf("[dry-run] 将建占位商品: %s", placeholderProductCode)
+		return
+	}
+	p = model.Product{
+		TenantBase: model.TenantBase{ShopID: ic.shopID},
+		PublicID:   uuid.New().String(),
+		Code:       placeholderProductCode,
+		Name:       "历史导入占位",
+		Unit:       "",
+		Remark:     "历史进销存导入占位商品：明细真实商品信息见单据明细行自身列，请勿用于新业务",
+	}
+	if err := ic.db.Create(&p).Error; err != nil {
+		log.Fatalf("创建占位商品失败: %v", err)
+	}
+	ic.placeholderProductID = p.ID
+	log.Printf("建占位商品: %s id=%d", placeholderProductCode, p.ID)
+}
+
+// matchPerson 把损坏的人员原值规整到三位真人之一，返回 user id 指针。
+// 匹配不到返回 nil（用于 creator/reviewer 等可空列；operator 另用 systemUserID 兜底）。
+func (ic *importCtx) matchPerson(raw string) *uint64 {
+	s := strings.TrimSpace(raw)
+	if s == "" {
+		return nil
+	}
+	for _, p := range realPeople {
+		// 完整名出现 或 前两汉字前缀命中（容损）
+		if strings.Contains(s, p.fullName) || strings.HasPrefix(s, p.prefix2) {
+			id := ic.personToUser[p.fullName]
+			return &id
+		}
+	}
+	ic.unmatchedOps[s]++
+	return nil
+}
+
+// findOrCreatePartner 按名匹配往来单位，缺失自动建。
+func (ic *importCtx) findOrCreatePartner(name, ptype string) *uint64 {
+	name = strings.TrimSpace(name)
+	if name == "" {
+		return nil
+	}
+	if cached, ok := ic.partnerCache[name]; ok {
+		return cached
+	}
+	var p model.Partner
+	if ic.db.Where("shop_id = ? AND name = ? AND deleted_at IS NULL", ic.shopID, name).First(&p).Error == nil {
+		id := p.ID
+		ic.partnerCache[name] = &id
+		return &id
+	}
+	ic.newPartners++
+	if ic.dryRun {
+		ic.partnerCache[name] = nil
+		return nil
+	}
+	p = model.Partner{
+		TenantBase: model.TenantBase{ShopID: ic.shopID},
+		Name:       name, Type: ptype, Status: "enabled",
+	}
+	if err := ic.db.Create(&p).Error; err != nil {
+		log.Printf("创建往来单位 %s 失败: %v", name, err)
+		ic.partnerCache[name] = nil
+		return nil
+	}
+	id := p.ID
+	ic.partnerCache[name] = &id
+	return &id
+}
+
+// ── 解析与映射 ───────────────────────────────────────────
+
+func mapStatus(raw string) string {
+	switch strings.TrimSpace(raw) {
+	case "已审核":
+		return "approved"
+	case "待审核":
+		return "pending"
+	case "被驳回", "作废":
+		return "rejected"
+	default:
+		return "draft"
+	}
+}
+
+func parseFloatLoose(s string) float64 {
+	s = strings.TrimSpace(strings.ReplaceAll(s, ",", ""))
+	if s == "" {
+		return 0
+	}
+	f, err := strconv.ParseFloat(s, 64)
+	if err != nil {
+		return 0
+	}
+	return f
+}
+
+var dateLayouts = []string{"2006-01-02", "2006/01/02", "2006-01-02 15:04:05", "2006/01/02 15:04:05"}
+
+func parseDatePtr(s string) *model.Date {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return nil
+	}
+	for _, l := range dateLayouts {
+		if t, err := time.ParseInLocation(l, s, time.Local); err == nil {
+			return &model.Date{Time: t}
+		}
+	}
+	// Excel 序列号
+	if serial, err := strconv.ParseFloat(s, 64); err == nil && serial > 0 && serial < 100000 {
+		base := time.Date(1899, 12, 30, 0, 0, 0, 0, time.Local)
+		return &model.Date{Time: base.AddDate(0, 0, int(serial))}
+	}
+	return nil
+}
+
+func parseDateOrNow(s string) model.Date {
+	if d := parseDatePtr(s); d != nil {
+		return *d
+	}
+	return model.Date{Time: time.Now()}
+}
+
+// readSheet 读取首个工作表，返回表头列名→列索引映射 + 数据行。
+func readSheet(path string) (map[string]int, [][]string) {
+	f, err := excelize.OpenFile(path)
+	if err != nil {
+		log.Fatalf("打开 %s 失败: %v", path, err)
+	}
+	defer f.Close()
+	rows, err := f.GetRows(f.GetSheetName(0))
+	if err != nil {
+		log.Fatalf("读取 %s 失败: %v", path, err)
+	}
+	if len(rows) < 1 {
+		log.Fatalf("%s 为空", path)
+	}
+	cols := map[string]int{}
+	for i, name := range rows[0] {
+		cols[strings.TrimSpace(name)] = i
+	}
+	return cols, rows[1:]
+}
+
+func get(row []string, cols map[string]int, name string) string {
+	idx, ok := cols[name]
+	if !ok || idx >= len(row) {
+		return ""
+	}
+	return strings.TrimSpace(row[idx])
+}
+
+// ── 核心导入 ─────────────────────────────────────────────
+
+func (ic *importCtx) importDoc(headerPath, detailPath string, isIn bool) {
+	label := "出库"
+	orderType := "sale"
+	partnerType := "customer"
+	if isIn {
+		label, orderType, partnerType = "入库", "purchase", "supplier"
+	}
+
+	hCols, hRows := readSheet(headerPath)
+	dCols, dRows := readSheet(detailPath)
+
+	// 明细按单据编号分组
+	detailsByNo := map[string][][]string{}
+	for _, r := range dRows {
+		no := get(r, dCols, "单据编号")
+		if no == "" {
+			continue
+		}
+		detailsByNo[no] = append(detailsByNo[no], r)
+	}
+
+	log.Printf("[%s] 表头 %d 单 / 明细 %d 行（%d 单号）", label, len(hRows), len(dRows), len(detailsByNo))
+
+	seen := map[string]bool{}
+	for _, hr := range hRows {
+		orderNo := get(hr, hCols, "单据编号")
+		if orderNo == "" || seen[orderNo] {
+			continue
+		}
+		seen[orderNo] = true
+
+		details := detailsByNo[orderNo]
+		if len(details) == 0 {
+			ic.statOrphanND++
+		}
+
+		partnerName := get(hr, hCols, "单位名称")
+		partnerID := ic.findOrCreatePartner(partnerName, partnerType)
+		operatorID := ic.systemUserID
+		if op := ic.matchPerson(get(hr, hCols, "经手人")); op != nil {
+			operatorID = *op
+		}
+		creatorID := ic.matchPerson(get(hr, hCols, "制单人"))
+		reviewerID := ic.matchPerson(get(hr, hCols, "审核人"))
+		status := mapStatus(get(hr, hCols, "单据状态"))
+		orderDate := parseDateOrNow(get(hr, hCols, "单据日期"))
+		totalAmount := parseFloatLoose(get(hr, hCols, "单据金额"))
+
+		if ic.dryRun {
+			// 幂等：已存在则计入跳过
+			var cnt int64
+			ic.tableForOrder(isIn).Where("shop_id = ? AND order_no = ?", ic.shopID, orderNo).Count(&cnt)
+			if cnt > 0 {
+				ic.statSkipped++
+				continue
+			}
+			ic.statOrders++
+			ic.statItems += len(details)
+			continue
+		}
+
+		if ic.writeOrder(isIn, orderNo, orderType, status, orderDate, totalAmount,
+			partnerID, operatorID, creatorID, reviewerID, details, dCols) {
+			ic.statOrders++
+			ic.statItems += len(details)
+		} else {
+			ic.statSkipped++
+		}
+	}
+
+	// 明细单号在表头里找不到的（理论上为 0，留作校验）
+	headerNos := map[string]bool{}
+	for _, hr := range hRows {
+		if no := get(hr, hCols, "单据编号"); no != "" {
+			headerNos[no] = true
+		}
+	}
+	for no := range detailsByNo {
+		if !headerNos[no] {
+			ic.statNoHeader++
+		}
+	}
+}
+
+func (ic *importCtx) tableForOrder(isIn bool) *gorm.DB {
+	if isIn {
+		return ic.db.Model(&model.StockInOrder{})
+	}
+	return ic.db.Model(&model.StockOutOrder{})
+}
+
+// writeOrder 在事务内写一张单 + 其明细。返回 false 表示 order_no 已存在（跳过）。
+func (ic *importCtx) writeOrder(
+	isIn bool, orderNo, orderType, status string, orderDate model.Date, totalAmount float64,
+	partnerID *uint64, operatorID uint64, creatorID, reviewerID *uint64,
+	details [][]string, dCols map[string]int,
+) bool {
+	created := false
+	err := ic.db.Transaction(func(tx *gorm.DB) error {
+		if isIn {
+			var cnt int64
+			tx.Model(&model.StockInOrder{}).Where("shop_id = ? AND order_no = ?", ic.shopID, orderNo).Count(&cnt)
+			if cnt > 0 {
+				return nil
+			}
+			o := model.StockInOrder{
+				TenantBase: model.TenantBase{ShopID: ic.shopID},
+				OrderNo:    orderNo, Type: orderType, WarehouseID: ic.whID,
+				PartnerID: partnerID, OperatorID: operatorID, CreatorID: creatorID,
+				ReviewerID: reviewerID, Status: status, OrderDate: orderDate, TotalAmount: totalAmount,
+			}
+			if err := tx.Create(&o).Error; err != nil {
+				return err
+			}
+			for _, dr := range details {
+				it := model.StockInItem{
+					OrderID: o.ID, ShopID: ic.shopID, ProductID: ic.placeholderProductID,
+					ProductCode: get(dr, dCols, "商品编号"),
+					ProductName: get(dr, dCols, "商品名称"),
+					Series:      get(dr, dCols, "系列"),
+					Spec:        get(dr, dCols, "规格"),
+					Quantity:    parseFloatLoose(get(dr, dCols, "数量")),
+					UnitPrice:   parseFloatLoose(get(dr, dCols, "单价")),
+					TotalPrice:  parseFloatLoose(get(dr, dCols, "金额")),
+					BatchNo:     get(dr, dCols, "批次号"),
+				}
+				it.ProductionDate = parseDatePtr(get(dr, dCols, "生产日期"))
+				if err := tx.Create(&it).Error; err != nil {
+					return err
+				}
+			}
+		} else {
+			var cnt int64
+			tx.Model(&model.StockOutOrder{}).Where("shop_id = ? AND order_no = ?", ic.shopID, orderNo).Count(&cnt)
+			if cnt > 0 {
+				return nil
+			}
+			o := model.StockOutOrder{
+				TenantBase: model.TenantBase{ShopID: ic.shopID},
+				OrderNo:    orderNo, Type: orderType, WarehouseID: ic.whID,
+				PartnerID: partnerID, OperatorID: operatorID, CreatorID: creatorID,
+				ReviewerID: reviewerID, Status: status, OrderDate: orderDate, TotalAmount: totalAmount,
+			}
+			if err := tx.Create(&o).Error; err != nil {
+				return err
+			}
+			for _, dr := range details {
+				it := model.StockOutItem{
+					OrderID: o.ID, ShopID: ic.shopID, ProductID: ic.placeholderProductID,
+					ProductCode: get(dr, dCols, "商品编号"),
+					ProductName: get(dr, dCols, "商品名称"),
+					Series:      get(dr, dCols, "系列"),
+					Spec:        get(dr, dCols, "规格"),
+					Quantity:    parseFloatLoose(get(dr, dCols, "数量")),
+					UnitPrice:   parseFloatLoose(get(dr, dCols, "单价")),
+					TotalPrice:  parseFloatLoose(get(dr, dCols, "金额")),
+					BatchNo:     get(dr, dCols, "批次号"),
+				}
+				it.ProductionDate = parseDatePtr(get(dr, dCols, "生产日期"))
+				if err := tx.Create(&it).Error; err != nil {
+					return err
+				}
+			}
+		}
+		created = true
+		return nil
+	})
+	if err != nil {
+		log.Printf("写单 %s 失败: %v", orderNo, err)
+		return false
+	}
+	return created
+}
+
+func (ic *importCtx) report() {
+	fmt.Println("═══════════════════════════════════════════")
+	fmt.Println("  历史数据导入汇总")
+	fmt.Println("═══════════════════════════════════════════")
+	if ic.dryRun {
+		fmt.Println("  *** DRY-RUN（未写库）***")
+	}
+	fmt.Printf("  新建单据：%d\n", ic.statOrders)
+	fmt.Printf("  新建明细：%d\n", ic.statItems)
+	fmt.Printf("  跳过(已存在)：%d\n", ic.statSkipped)
+	fmt.Printf("  无明细单：%d\n", ic.statOrphanND)
+	fmt.Printf("  明细缺表头(应为0)：%d\n", ic.statNoHeader)
+	fmt.Printf("  新建往来单位：%d\n", ic.newPartners)
+	if len(ic.unmatchedOps) > 0 {
+		fmt.Printf("  未匹配人员(归 system)：%d 种\n", len(ic.unmatchedOps))
+		shown := 0
+		for k, v := range ic.unmatchedOps {
+			fmt.Printf("    %q ×%d\n", k, v)
+			if shown++; shown >= 15 {
+				fmt.Println("    ...")
+				break
+			}
+		}
+	}
+	fmt.Println("═══════════════════════════════════════════")
+}

backend/cmd/import-history/main_test.go

@@ -0,0 +1,105 @@
+package main
+
+import "testing"
+
+func TestMapStatus(t *testing.T) {
+	cases := map[string]string{
+		"已审核": "approved",
+		"待审核": "pending",
+		"被驳回": "rejected",
+		"作废":  "rejected",
+		"":    "draft",
+		"未知":  "draft",
+		" 已审核 ": "approved",
+	}
+	for in, want := range cases {
+		if got := mapStatus(in); got != want {
+			t.Errorf("mapStatus(%q)=%q want %q", in, got, want)
+		}
+	}
+}
+
+func TestParseFloatLoose(t *testing.T) {
+	cases := map[string]float64{
+		"":          0,
+		"  ":        0,
+		"123":       123,
+		"1,234.50":  1234.5,
+		"abc":       0,
+		"-9.9":      -9.9,
+	}
+	for in, want := range cases {
+		if got := parseFloatLoose(in); got != want {
+			t.Errorf("parseFloatLoose(%q)=%v want %v", in, got, want)
+		}
+	}
+}
+
+func TestParseDatePtr(t *testing.T) {
+	if parseDatePtr("") != nil {
+		t.Error("empty should be nil")
+	}
+	if parseDatePtr("garbage") != nil {
+		t.Error("garbage should be nil")
+	}
+	for _, s := range []string{"2023/04/04", "1998-12-08", "2023/04/04 10:30:00"} {
+		if d := parseDatePtr(s); d == nil {
+			t.Errorf("parseDatePtr(%q) should parse", s)
+		}
+	}
+	d := parseDatePtr("2023-04-04")
+	if d == nil || d.Time.Year() != 2023 || int(d.Time.Month()) != 4 || d.Time.Day() != 4 {
+		t.Errorf("parseDatePtr 2023-04-04 wrong: %+v", d)
+	}
+}
+
+// matchPerson：损坏的人员列容损规整到三位真人，匹配不到归 nil。
+func newTestCtx() *importCtx {
+	ic := &importCtx{}
+	ic.personToUser = map[string]uint64{"丁国辉": 11, "刘春燕": 12, "张志磊": 13, "汤振宇": 14}
+	ic.unmatchedOps = map[string]int{}
+	return ic
+}
+
+func TestMatchPerson(t *testing.T) {
+	ic := newTestCtx()
+	check := func(raw string, wantID uint64, wantNil bool) {
+		got := ic.matchPerson(raw)
+		if wantNil {
+			if got != nil {
+				t.Errorf("matchPerson(%q) want nil got %v", raw, *got)
+			}
+			return
+		}
+		if got == nil || *got != wantID {
+			t.Errorf("matchPerson(%q) want %d got %v", raw, wantID, got)
+		}
+	}
+	check("丁国辉", 11, false)
+	check("丁国GSHD", 11, false) // 容损前缀
+	check("张志繥SHD", 13, false)
+	check("刘春燕", 12, false)
+	check("汤振宇", 14, false)
+	check("", 0, true)
+	check("4", 0, true) // 单字符乱码
+	check("王五", 0, true)
+
+	if ic.unmatchedOps["王五"] != 1 || ic.unmatchedOps["4"] != 1 {
+		t.Errorf("unmatchedOps not recorded: %+v", ic.unmatchedOps)
+	}
+}
+
+func TestGetColumn(t *testing.T) {
+	cols := map[string]int{"单据编号": 0, "商品名称": 1, "数量": 2}
+	row := []string{"RK001", " 飞天茅台 ", "12"}
+	if got := get(row, cols, "商品名称"); got != "飞天茅台" {
+		t.Errorf("get trimmed wrong: %q", got)
+	}
+	if got := get(row, cols, "不存在"); got != "" {
+		t.Errorf("missing col should be empty: %q", got)
+	}
+	// 行短于列索引时不越界
+	if got := get([]string{"RK001"}, cols, "数量"); got != "" {
+		t.Errorf("short row should be empty: %q", got)
+	}
+}

backend/config/config.go

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

backend/internal/handler/auth.go

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

backend/internal/model/stock.go

@@ -11,6 +11,7 @@ type StockInOrder struct {
 	WarehouseID  uint64     `gorm:"not null" json:"warehouse_id" binding:"required,min=1"`
 	PartnerID    *uint64    `json:"partner_id"`
 	OperatorID   uint64     `gorm:"not null" json:"operator_id"`
+	CreatorID    *uint64    `json:"creator_id"`
 	ReviewerID   *uint64    `json:"reviewer_id"`
 	Status       string     `gorm:"type:enum('draft','pending','approved','rejected');default:'draft'" json:"status"`
 	OrderDate    Date       `gorm:"type:date" json:"order_date"`
@@ -23,6 +24,7 @@ type StockInOrder struct {
 	Warehouse *Warehouse    `gorm:"foreignKey:WarehouseID" json:"warehouse,omitempty"`
 	Partner   *Partner      `gorm:"foreignKey:PartnerID" json:"partner,omitempty"`
 	Operator  *User         `gorm:"foreignKey:OperatorID" json:"operator,omitempty"`
+	Creator   *User         `gorm:"foreignKey:CreatorID" json:"creator,omitempty"`
 	Reviewer  *User         `gorm:"foreignKey:ReviewerID" json:"reviewer,omitempty"`
 }
 
@@ -31,6 +33,11 @@ type StockInItem struct {
 	OrderID      uint64  `gorm:"not null;index" json:"order_id"`
 	ShopID       uint64  `gorm:"not null" json:"shop_id"`
 	ProductID    uint64  `gorm:"not null" json:"product_id"`
+	// 历史导入快照列：源明细自带的商品信息，不依赖 product 主数据（product_id 可为 0）。
+	ProductCode  string  `gorm:"size:50" json:"product_code"`
+	ProductName  string  `gorm:"size:255" json:"product_name"`
+	Series       string  `gorm:"size:100" json:"series"`
+	Spec         string  `gorm:"size:100" json:"spec"`
 	Quantity     float64 `gorm:"type:decimal(12,3);not null" json:"quantity"`
 	UnitPrice    float64 `gorm:"type:decimal(16,2);default:0" json:"unit_price"`
 	TotalPrice   float64 `gorm:"type:decimal(16,2);default:0" json:"total_price"`
@@ -52,6 +59,7 @@ type StockOutOrder struct {
 	WarehouseID  uint64     `gorm:"not null" json:"warehouse_id" binding:"required,min=1"`
 	PartnerID    *uint64    `json:"partner_id"`
 	OperatorID   uint64     `gorm:"not null" json:"operator_id"`
+	CreatorID    *uint64    `json:"creator_id"`
 	ReviewerID   *uint64    `json:"reviewer_id"`
 	Status       string     `gorm:"type:enum('draft','pending','approved','rejected');default:'draft'" json:"status"`
 	OrderDate    Date       `gorm:"type:date" json:"order_date"`
@@ -64,6 +72,7 @@ type StockOutOrder struct {
 	Warehouse *Warehouse     `gorm:"foreignKey:WarehouseID" json:"warehouse,omitempty"`
 	Partner   *Partner       `gorm:"foreignKey:PartnerID" json:"partner,omitempty"`
 	Operator  *User          `gorm:"foreignKey:OperatorID" json:"operator,omitempty"`
+	Creator   *User          `gorm:"foreignKey:CreatorID" json:"creator,omitempty"`
 	Reviewer  *User          `gorm:"foreignKey:ReviewerID" json:"reviewer,omitempty"`
 }
 
@@ -72,9 +81,16 @@ type StockOutItem struct {
 	OrderID      uint64  `gorm:"not null;index" json:"order_id"`
 	ShopID       uint64  `gorm:"not null" json:"shop_id"`
 	ProductID    uint64  `gorm:"not null" json:"product_id"`
+	// 历史导入快照列：源明细自带的商品信息，不依赖 product 主数据（product_id 可为 0）。
+	ProductCode  string  `gorm:"size:50" json:"product_code"`
+	ProductName  string  `gorm:"size:255" json:"product_name"`
+	Series       string  `gorm:"size:100" json:"series"`
+	Spec         string  `gorm:"size:100" json:"spec"`
 	Quantity     float64 `gorm:"type:decimal(12,3);not null" json:"quantity"`
 	UnitPrice    float64 `gorm:"type:decimal(16,2);default:0" json:"unit_price"`
 	TotalPrice   float64 `gorm:"type:decimal(16,2);default:0" json:"total_price"`
+	BatchNo        string  `gorm:"size:50" json:"batch_no"`
+	ProductionDate *Date   `gorm:"type:date" json:"production_date"`
 	CustomFields JSON    `gorm:"type:json" json:"custom_fields,omitempty"`
 	Remark       string  `gorm:"size:255" json:"remark"`
 

backend/internal/service/auth.go

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

backend/internal/service/session_test.go

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

backend/schema/schema.sql

@@ -273,6 +273,7 @@ CREATE TABLE IF NOT EXISTS `stock_in_orders` (
   `warehouse_id` BIGINT UNSIGNED NOT NULL,
   `partner_id`   BIGINT UNSIGNED DEFAULT NULL COMMENT '供应商',
   `operator_id`  BIGINT UNSIGNED NOT NULL COMMENT '经办人',
+  `creator_id`   BIGINT UNSIGNED DEFAULT NULL COMMENT '制单人',
   `reviewer_id`  BIGINT UNSIGNED DEFAULT NULL COMMENT '审核人',
   `status`       ENUM('draft','pending','approved','rejected') NOT NULL DEFAULT 'draft',
   `order_date`   DATE            NOT NULL,
@@ -299,6 +300,10 @@ CREATE TABLE IF NOT EXISTS `stock_in_items` (
   `order_id`     BIGINT UNSIGNED NOT NULL,
   `shop_id`      BIGINT UNSIGNED NOT NULL,
   `product_id`   BIGINT UNSIGNED NOT NULL,
+  `product_code` VARCHAR(50)     DEFAULT NULL COMMENT '商品编号(源流水号，历史导入)',
+  `product_name` VARCHAR(255)    DEFAULT NULL COMMENT '商品名称(历史导入快照)',
+  `series`       VARCHAR(100)    DEFAULT NULL COMMENT '系列(历史导入快照)',
+  `spec`         VARCHAR(100)    DEFAULT NULL COMMENT '规格(历史导入快照)',
   `quantity`     DECIMAL(12,3)   NOT NULL COMMENT '数量',
   `unit_price`   DECIMAL(16,2)   NOT NULL DEFAULT 0 COMMENT '单价',
   `total_price`  DECIMAL(16,2)   NOT NULL DEFAULT 0,
@@ -323,6 +328,7 @@ CREATE TABLE IF NOT EXISTS `stock_out_orders` (
   `warehouse_id` BIGINT UNSIGNED NOT NULL,
   `partner_id`   BIGINT UNSIGNED DEFAULT NULL COMMENT '客户',
   `operator_id`  BIGINT UNSIGNED NOT NULL,
+  `creator_id`   BIGINT UNSIGNED DEFAULT NULL COMMENT '制单人',
   `reviewer_id`  BIGINT UNSIGNED DEFAULT NULL,
   `status`       ENUM('draft','pending','approved','rejected') NOT NULL DEFAULT 'draft',
   `order_date`   DATE            NOT NULL,
@@ -349,9 +355,15 @@ CREATE TABLE IF NOT EXISTS `stock_out_items` (
   `order_id`     BIGINT UNSIGNED NOT NULL,
   `shop_id`      BIGINT UNSIGNED NOT NULL,
   `product_id`   BIGINT UNSIGNED NOT NULL,
+  `product_code` VARCHAR(50)     DEFAULT NULL COMMENT '商品编号(源流水号，历史导入)',
+  `product_name` VARCHAR(255)    DEFAULT NULL COMMENT '商品名称(历史导入快照)',
+  `series`       VARCHAR(100)    DEFAULT NULL COMMENT '系列(历史导入快照)',
+  `spec`         VARCHAR(100)    DEFAULT NULL COMMENT '规格(历史导入快照)',
   `quantity`     DECIMAL(12,3)   NOT NULL,
   `unit_price`   DECIMAL(16,2)   NOT NULL DEFAULT 0,
   `total_price`  DECIMAL(16,2)   NOT NULL DEFAULT 0,
+  `batch_no`        VARCHAR(50)  DEFAULT NULL COMMENT '批次号',
+  `production_date` DATE         DEFAULT NULL COMMENT '生产日期',
   `custom_fields` JSON           DEFAULT NULL,
   `remark`       VARCHAR(255)    DEFAULT NULL,
   PRIMARY KEY (`id`),

backend/testutil/setup.go

@@ -28,6 +28,7 @@ func InitConfig() {
 			RefreshExpireH:  168,
 		},
 		Session: config.SessionConfig{
+			LimitTotal:    5,
 			LimitDesktop:  2,
 			LimitMobile:   2,
 			LimitWeb:      2,
@@ -278,6 +279,7 @@ func SetupTestDB() *gorm.DB {
 			warehouse_id INTEGER NOT NULL,
 			partner_id INTEGER,
 			operator_id INTEGER NOT NULL,
+			creator_id INTEGER,
 			reviewer_id INTEGER,
 			status TEXT DEFAULT 'draft',
 			order_date DATETIME,
@@ -295,6 +297,10 @@ func SetupTestDB() *gorm.DB {
 			order_id INTEGER NOT NULL,
 			shop_id INTEGER NOT NULL,
 			product_id INTEGER NOT NULL,
+			product_code TEXT,
+			product_name TEXT,
+			series TEXT,
+			spec TEXT,
 			quantity REAL NOT NULL,
 			unit_price REAL DEFAULT 0,
 			total_price REAL DEFAULT 0,
@@ -314,6 +320,7 @@ func SetupTestDB() *gorm.DB {
 			warehouse_id INTEGER NOT NULL,
 			partner_id INTEGER,
 			operator_id INTEGER NOT NULL,
+			creator_id INTEGER,
 			reviewer_id INTEGER,
 			status TEXT DEFAULT 'draft',
 			order_date DATETIME,
@@ -331,9 +338,15 @@ func SetupTestDB() *gorm.DB {
 			order_id INTEGER NOT NULL,
 			shop_id INTEGER NOT NULL,
 			product_id INTEGER NOT NULL,
+			product_code TEXT,
+			product_name TEXT,
+			series TEXT,
+			spec TEXT,
 			quantity REAL NOT NULL,
 			unit_price REAL DEFAULT 0,
 			total_price REAL DEFAULT 0,
+			batch_no TEXT,
+			production_date DATETIME,
 			custom_fields TEXT,
 			remark TEXT
 		)`,

client/ios/Runner.xcodeproj/project.pbxproj

@@ -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++";

client/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -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"}}

client/ios/Runner/Info.plist

@@ -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>

client/lib/core/api/api_client.dart

@@ -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',
       },

client/lib/core/api/retry_interceptor.dart

@@ -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';

client/lib/core/auth/auth_state.dart

@@ -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 (_) {

client/lib/core/config/app_constants.dart

@@ -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;
+}

client/lib/core/errors/error_reporter.dart

@@ -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!;
   }

client/lib/core/router/app_router.dart

@@ -20,8 +20,7 @@ import '../../screens/about/about_screen.dart';
 import '../../screens/devices/device_management_screen.dart';
 import '../auth/auth_state.dart';
 
-Page<void> _noTransition(Widget child) =>
-    NoTransitionPage<void>(child: child);
+Page<void> _noTransition(Widget child) => NoTransitionPage<void>(child: child);
 
 /// ChangeNotifier that bridges Riverpod auth state → GoRouter refreshListenable.
 class _RouterNotifier extends ChangeNotifier {
@@ -94,74 +93,106 @@ final appRouterProvider = Provider<GoRouter>((ref) {
         path: '/login',
         builder: (context, state) => const LoginScreen(),
       ),
-      ShellRoute(
-        builder: (context, state, child) => AppShell(child: child),
-        routes: [
-          GoRoute(
-              path: '/stock-in',
-              pageBuilder: (_, __) => _noTransition(const StockInListScreen())),
-          GoRoute(
-              path: '/stock-in/new',
-              pageBuilder: (_, __) => _noTransition(const StockInFormScreen())),
-          GoRoute(
-              path: '/stock-in/edit/:id',
-              pageBuilder: (_, state) => _noTransition(
-                  StockInFormScreen(
-                      editOrderId: int.parse(state.pathParameters['id']!)))),
-          GoRoute(
-              path: '/stock-out',
-              pageBuilder: (_, __) => _noTransition(const StockOutListScreen())),
-          GoRoute(
-              path: '/stock-out/new',
-              pageBuilder: (_, __) => _noTransition(const StockOutFormScreen())),
-          GoRoute(
-              path: '/stock-out/edit/:id',
-              pageBuilder: (_, state) => _noTransition(
-                  StockOutFormScreen(
-                      editOrderId: int.parse(state.pathParameters['id']!)))),
-          GoRoute(
-              path: '/inventory',
-              pageBuilder: (_, __) =>
-                  _noTransition(const InventoryListScreen())),
-          GoRoute(
-              path: '/inventory/check',
-              pageBuilder: (_, __) =>
-                  _noTransition(const InventoryCheckScreen())),
-          GoRoute(
-              path: '/partners',
-              pageBuilder: (_, __) => _noTransition(const PartnersScreen())),
-          GoRoute(
-              path: '/finance',
-              pageBuilder: (_, __) => _noTransition(const FinanceScreen())),
-          GoRoute(
-              path: '/products',
-              pageBuilder: (_, __) => _noTransition(const ProductsScreen())),
-          GoRoute(
-              path: '/products/:id',
-              pageBuilder: (_, state) => _noTransition(ProductDetailScreen(
-                  productId: int.parse(state.pathParameters['id']!)))),
-          GoRoute(
-              path: '/settings',
-              pageBuilder: (_, state) {
-                const tabIndex = {
-                  'shop': 0,
-                  'users': 1,
-                  'number': 2,
-                  'system': 3,
-                  'license': 4,
-                  'import': 5,
-                };
-                final tab =
-                    tabIndex[state.uri.queryParameters['tab']] ?? 0;
-                return _noTransition(SettingsScreen(initialTab: tab));
-              }),
-          GoRoute(
-              path: '/devices',
-              pageBuilder: (_, __) =>
-                  _noTransition(const DeviceManagementScreen())),
-          GoRoute(
-              path: '/about',
-              pageBuilder: (_, __) => _noTransition(const AboutScreen())),
+      // 各栏目拆为独立分支：StatefulShellRoute.indexedStack 让每个分支的 Navigator
+      // 及其页面 State 常驻，跨栏目切换不再销毁上一页（半填表单/内部 tab/滚动位置保活）。
+      // 分支顺序必须与 AppShell._navItems 一致（navigationShell.currentIndex 据此高亮）。
+      StatefulShellRoute.indexedStack(
+        builder: (context, state, navigationShell) =>
+            AppShell(navigationShell: navigationShell),
+        branches: [
+          // 0 入库管理
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/stock-in',
+                pageBuilder: (_, __) =>
+                    _noTransition(const StockInListScreen())),
+            GoRoute(
+                path: '/stock-in/new',
+                pageBuilder: (_, __) =>
+                    _noTransition(const StockInFormScreen())),
+            GoRoute(
+                path: '/stock-in/edit/:id',
+                pageBuilder: (_, state) => _noTransition(StockInFormScreen(
+                    editOrderId: int.parse(state.pathParameters['id']!)))),
+          ]),
+          // 1 出库管理
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/stock-out',
+                pageBuilder: (_, __) =>
+                    _noTransition(const StockOutListScreen())),
+            GoRoute(
+                path: '/stock-out/new',
+                pageBuilder: (_, __) =>
+                    _noTransition(const StockOutFormScreen())),
+            GoRoute(
+                path: '/stock-out/edit/:id',
+                pageBuilder: (_, state) => _noTransition(StockOutFormScreen(
+                    editOrderId: int.parse(state.pathParameters['id']!)))),
+          ]),
+          // 2 库存管理
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/inventory',
+                pageBuilder: (_, __) =>
+                    _noTransition(const InventoryListScreen())),
+            GoRoute(
+                path: '/inventory/check',
+                pageBuilder: (_, __) =>
+                    _noTransition(const InventoryCheckScreen())),
+          ]),
+          // 3 财务管理
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/finance',
+                pageBuilder: (_, __) => _noTransition(const FinanceScreen())),
+          ]),
+          // 4 往来单位
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/partners',
+                pageBuilder: (_, __) => _noTransition(const PartnersScreen())),
+          ]),
+          // 5 基础数据
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/products',
+                pageBuilder: (_, __) => _noTransition(const ProductsScreen())),
+            GoRoute(
+                path: '/products/:id',
+                pageBuilder: (_, state) => _noTransition(ProductDetailScreen(
+                    productId: int.parse(state.pathParameters['id']!)))),
+          ]),
+          // 6 设备管理
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/devices',
+                pageBuilder: (_, __) =>
+                    _noTransition(const DeviceManagementScreen())),
+          ]),
+          // 7 系统设置
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/settings',
+                pageBuilder: (_, state) {
+                  const tabIndex = {
+                    'shop': 0,
+                    'users': 1,
+                    'number': 2,
+                    'system': 3,
+                    'license': 4,
+                    'import': 5,
+                  };
+                  final tab = tabIndex[state.uri.queryParameters['tab']] ?? 0;
+                  return _noTransition(SettingsScreen(initialTab: tab));
+                }),
+          ]),
+          // 8 关于我们
+          StatefulShellBranch(routes: [
+            GoRoute(
+                path: '/about',
+                pageBuilder: (_, __) => _noTransition(const AboutScreen())),
+          ]),
         ],
       ),
     ],

client/lib/core/update/app_updater_io.dart

@@ -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);
   }
 

client/lib/core/utils/date_util.dart

@@ -0,0 +1,22 @@
+/// 日期工具：统一 `yyyy-MM-dd` 的格式化与解析，收敛各处重复的 padLeft 逻辑。
+library;
+
+/// 格式化为 `yyyy-MM-dd`（提交后端的统一格式）。
+String formatYmd(DateTime d) =>
+    '${d.year}-${d.month.toString().padLeft(2, '0')}-${d.day.toString().padLeft(2, '0')}';
+
+/// 解析 `yyyy-MM-dd`（或更长的带时间字符串，取前 10 位）。无效返回 null。
+DateTime? parseYmd(String? s) {
+  if (s == null || s.isEmpty) return null;
+  final t = s.length >= 10 ? s.substring(0, 10) : s;
+  return DateTime.tryParse(t);
+}
+
+/// 组合年/月/日为 `yyyy-MM-dd`，自动把超出当月的「日」clamp 回当月最大值
+/// （如 2 月选 31 → 28/29）。任一为空返回 null。
+String? composeYmd(int? year, int? month, int? day) {
+  if (year == null || month == null || day == null) return null;
+  final maxDay = DateTime(year, month + 1, 0).day; // 下月第 0 天 = 当月最后一天
+  final d = day > maxDay ? maxDay : day;
+  return formatYmd(DateTime(year, month, d));
+}

client/lib/models/license.dart

@@ -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,

client/lib/models/shop.dart

@@ -7,6 +7,8 @@ class ShopInfo {
   final String managerName;
   final String logoUrl;
   final String wechatId;
+  // 店级动态配置（后端 shops.custom_fields JSON），存录入默认值等轻量配置
+  final Map<String, dynamic> customFields;
 
   const ShopInfo({
     required this.id,
@@ -17,8 +19,24 @@ class ShopInfo {
     required this.managerName,
     this.logoUrl = '',
     this.wechatId = '',
+    this.customFields = const {},
   });
 
+  /// 入库录入默认商品名称选项 id（未配置返回 null）。
+  int? get defaultNameId => _asInt(customFields['default_name_id']);
+
+  /// 入库录入默认系列选项 id（未配置返回 null）。
+  int? get defaultSeriesId => _asInt(customFields['default_series_id']);
+
+  /// 入库录入默认规格选项 id（未配置返回 null）。
+  int? get defaultSpecId => _asInt(customFields['default_spec_id']);
+
+  static int? _asInt(dynamic v) {
+    if (v == null) return null;
+    if (v is num) return v.toInt();
+    return int.tryParse(v.toString());
+  }
+
   factory ShopInfo.fromJson(Map<String, dynamic> json) => ShopInfo(
         id: (json['id'] as num).toInt(),
         code: json['code'] as String? ?? '',
@@ -28,5 +46,8 @@ class ShopInfo {
         managerName: json['manager_name'] as String? ?? '',
         logoUrl: json['logo_url'] as String? ?? '',
         wechatId: json['wechat_id'] as String? ?? '',
+        customFields:
+            (json['custom_fields'] as Map?)?.cast<String, dynamic>() ??
+                const {},
       );
 }

client/lib/models/stock_in.dart

@@ -34,7 +34,17 @@ class StockInItem {
     this.productStorage,
   });
 
-  factory StockInItem.fromJson(Map<String, dynamic> json) => StockInItem(
+  factory StockInItem.fromJson(Map<String, dynamic> json) {
+    final product = json['product'] as Map<String, dynamic>?;
+    // 历史导入行 product_id=0、无 product 关联，商品信息存在明细行自身列上。
+    // 优先取明细行快照列，回退到 product 关联（App 新建单据走 product）。
+    String? lineOrProduct(String lineKey, String productKey) {
+      final line = json[lineKey] as String?;
+      if (line != null && line.isNotEmpty) return line;
+      return product?[productKey] as String?;
+    }
+
+    return StockInItem(
         orderId: json['order_id'] != null
             ? (json['order_id'] as num).toInt()
             : null,
@@ -44,10 +54,10 @@ class StockInItem {
         totalPrice: (json['total_price'] as num).toDouble(),
         batchNo: json['batch_no'] as String?,
         productionDate: json['production_date'] as String?,
-        productName: (json['product'] as Map<String, dynamic>?)?['name'] as String?,
-        productCode: (json['product'] as Map<String, dynamic>?)?['code'] as String?,
-        productSeries: (json['product'] as Map<String, dynamic>?)?['series'] as String?,
-        productSpec: (json['product'] as Map<String, dynamic>?)?['spec'] as String?,
+        productName: lineOrProduct('product_name', 'name'),
+        productCode: lineOrProduct('product_code', 'code'),
+        productSeries: lineOrProduct('series', 'series'),
+        productSpec: lineOrProduct('spec', 'spec'),
         productUnit: (json['product'] as Map<String, dynamic>?)?['unit'] as String?,
         productOrigin: ((json['product'] as Map<String, dynamic>?)?['origin']
             as Map<String, dynamic>?)?['name'] as String?,
@@ -56,6 +66,7 @@ class StockInItem {
         productStorage: ((json['product'] as Map<String, dynamic>?)?['storage']
             as Map<String, dynamic>?)?['name'] as String?,
       );
+  }
 
   Map<String, dynamic> toJson() => {
         'product_id': productId,

client/lib/models/stock_out.dart

@@ -23,7 +23,17 @@ class StockOutItem {
     this.productUnit,
   });
 
-  factory StockOutItem.fromJson(Map<String, dynamic> json) => StockOutItem(
+  factory StockOutItem.fromJson(Map<String, dynamic> json) {
+    final product = json['product'] as Map<String, dynamic>?;
+    // 历史导入行 product_id=0、无 product 关联，商品信息存在明细行自身列上。
+    // 优先取明细行快照列，回退到 product 关联（App 新建单据走 product）。
+    String? lineOrProduct(String lineKey, String productKey) {
+      final line = json[lineKey] as String?;
+      if (line != null && line.isNotEmpty) return line;
+      return product?[productKey] as String?;
+    }
+
+    return StockOutItem(
         orderId: json['order_id'] != null
             ? (json['order_id'] as num).toInt()
             : null,
@@ -31,12 +41,13 @@ class StockOutItem {
         quantity: (json['quantity'] as num).toDouble(),
         unitPrice: (json['unit_price'] as num).toDouble(),
         totalPrice: (json['total_price'] as num).toDouble(),
-        productName: (json['product'] as Map<String, dynamic>?)?['name'] as String?,
-        productCode: (json['product'] as Map<String, dynamic>?)?['code'] as String?,
-        productSeries: (json['product'] as Map<String, dynamic>?)?['series'] as String?,
-        productSpec: (json['product'] as Map<String, dynamic>?)?['spec'] as String?,
+        productName: lineOrProduct('product_name', 'name'),
+        productCode: lineOrProduct('product_code', 'code'),
+        productSeries: lineOrProduct('series', 'series'),
+        productSpec: lineOrProduct('spec', 'spec'),
         productUnit: (json['product'] as Map<String, dynamic>?)?['unit'] as String?,
       );
+  }
 }
 
 class StockOutOrder {

client/lib/providers/connectivity_provider.dart

@@ -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));
       }
     }
 

client/lib/providers/finance_provider.dart

@@ -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 = '';
 

client/lib/providers/inventory_provider.dart

@@ -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

client/lib/providers/partner_provider.dart

@@ -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;
 

client/lib/providers/product_provider.dart

@@ -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;

client/lib/providers/session_heartbeat.dart

@@ -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 {

client/lib/providers/stock_in_provider.dart

@@ -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,7 +19,7 @@ final stockInListProvider =
 
 class StockInListNotifier extends AsyncNotifier<PageResult<StockInOrder>> {
   int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
   String _status = '';
   String? _startDate;
   String? _endDate;

client/lib/providers/stock_out_provider.dart

@@ -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,7 +19,7 @@ final stockOutListProvider =
 
 class StockOutListNotifier extends AsyncNotifier<PageResult<StockOutOrder>> {
   int _page = 1;
-  int _pageSize = 20;
+  int _pageSize = AppConstants.defaultPageSize;
   String _status = '';
   String? _startDate;
   String? _endDate;

client/lib/providers/update_provider.dart

@@ -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);

client/lib/screens/auth/login_screen.dart

@@ -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);
         });
       }
     });

client/lib/screens/finance/finance_screen.dart

@@ -1,18 +1,22 @@
 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';
 import '../../widgets/data_table_card.dart';
 import '../../widgets/mobile_list_card.dart';
-import '../../widgets/multi_select_dropdown.dart' show ColDef, ColumnToggleButton, FilterableColumnHeader;
+import '../../widgets/multi_select_dropdown.dart'
+    show ColDef, ColumnToggleButton, FilterableColumnHeader;
 import '../../core/storage/column_prefs.dart';
 import '../../widgets/page_scaffold.dart';
 import '../../providers/connectivity_provider.dart';
 import '../../core/utils/export_util.dart';
+import '../../core/utils/date_util.dart';
 import '../../repositories/finance_repository.dart';
 import '../../widgets/write_guard.dart';
+import '../../widgets/date_picker_field.dart';
 
 class FinanceScreen extends ConsumerWidget {
   const FinanceScreen({super.key});
@@ -46,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 = [];
@@ -140,11 +144,12 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
 
   /// 财务记录：窄屏卡片
   Widget _financeCard(FinanceRecord r) {
-    final canClose = (r.type == 'payable' || r.type == 'receivable') &&
-        r.status == 'open';
+    final canClose =
+        (r.type == 'payable' || r.type == 'receivable') && r.status == 'open';
     final showStatus = r.type == 'payable' || r.type == 'receivable';
     return MobileListCard(
-      title: Text(r.partnerName?.isNotEmpty == true ? r.partnerName! : r.typeLabel),
+      title: Text(
+          r.partnerName?.isNotEmpty == true ? r.partnerName! : r.typeLabel),
       subtitle: Text(r.recordDate?.substring(0, 10) ?? '-'),
       trailing: _TypeBadge(r.typeLabel),
       fields: [
@@ -154,9 +159,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
               '¥${r.balance.toStringAsFixed(2)}',
               style: TextStyle(
                 fontSize: 13,
-                color: r.balance > 0
-                    ? AppTheme.danger
-                    : AppTheme.textSecondary,
+                color: r.balance > 0 ? AppTheme.danger : AppTheme.textSecondary,
                 fontWeight: FontWeight.w600,
               ),
             )),
@@ -204,9 +207,11 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(Icons.cloud_off, size: 40, color: AppTheme.textSecondary),
+                const Icon(Icons.cloud_off,
+                    size: 40, color: AppTheme.textSecondary),
                 const SizedBox(height: 12),
-                const Text('暂无数据，网络不可用', style: TextStyle(color: AppTheme.textSecondary)),
+                const Text('暂无数据，网络不可用',
+                    style: TextStyle(color: AppTheme.textSecondary)),
                 const SizedBox(height: 12),
                 ElevatedButton(onPressed: _refetch, child: const Text('重试')),
               ],
@@ -223,13 +228,18 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
     // Summary: only for payable/receivable tabs
     final totalAmount = records.fold(0.0, (s, r) => s + r.amount);
     final openAmount = records
-        .where((r) => (r.type == 'payable' || r.type == 'receivable') && r.status == 'open')
+        .where((r) =>
+            (r.type == 'payable' || r.type == 'receivable') &&
+            r.status == 'open')
         .fold(0.0, (s, r) => s + r.amount);
     final closedAmount = records
-        .where((r) => (r.type == 'payable' || r.type == 'receivable') && r.status == 'closed')
+        .where((r) =>
+            (r.type == 'payable' || r.type == 'receivable') &&
+            r.status == 'closed')
         .fold(0.0, (s, r) => s + r.amount);
 
-    final typeOptions = _allRecords.map((r) => r.typeLabel).toSet().toList()..sort();
+    final typeOptions = _allRecords.map((r) => r.typeLabel).toSet().toList()
+      ..sort();
     final partnerOptions = _allRecords
         .map((r) => r.partnerName ?? '')
         .where((s) => s.isNotEmpty)
@@ -245,8 +255,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
             .map((c) => c.key)
             .toSet();
     // 列可见性只看用户选择（minWidth 仅作首次默认，不再运行时强制隐藏）。
-    final visibleCols =
-        _colDefs.where((c) => !hidden.contains(c.key)).toList();
+    final visibleCols = _colDefs.where((c) => !hidden.contains(c.key)).toList();
 
     final columns = visibleCols.map((c) {
       final label = switch (c.key) {
@@ -265,8 +274,7 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
         _ => Text(c.label),
       };
       return DataColumn(
-          label: label,
-          numeric: c.key == 'amount' || c.key == 'balance');
+          label: label, numeric: c.key == 'amount' || c.key == 'balance');
     }).toList();
 
     DataCell buildFinanceCell(String key, FinanceRecord r) {
@@ -314,7 +322,8 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
             width: 160,
             child: Text(r.remark ?? '-',
                 overflow: TextOverflow.ellipsis,
-                style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary)),
+                style: const TextStyle(
+                    fontSize: 12, color: AppTheme.textSecondary)),
           ));
         case 'actions':
           if ((r.type == 'payable' || r.type == 'receivable') &&
@@ -348,7 +357,9 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
           ]
         : records
             .map((r) => DataRow(
-                  cells: visibleCols.map((c) => buildFinanceCell(c.key, r)).toList(),
+                  cells: visibleCols
+                      .map((c) => buildFinanceCell(c.key, r))
+                      .toList(),
                 ))
             .toList();
 
@@ -441,19 +452,30 @@ class _FinanceTabState extends ConsumerState<_FinanceTab> {
                             : '应收账款';
                     exportExcel(
                       filename: tabName,
-                      headers: ['日期', '类型', '往来单位', '关联单据', '金额', '余额', '状态', '备注'],
-                      rows: records.map((r) => [
-                        r.recordDate?.substring(0, 10) ?? '',
-                        r.typeLabel,
-                        r.partnerName ?? '',
-                        r.refType != null && r.refId != null
-                            ? '${r.refType!.replaceAll('_', '-')}#${r.refId}'
-                            : '',
-                        r.amount,
-                        r.balance,
-                        r.status == 'open' ? '未结清' : '已结清',
-                        r.remark ?? '',
-                      ]).toList(),
+                      headers: [
+                        '日期',
+                        '类型',
+                        '往来单位',
+                        '关联单据',
+                        '金额',
+                        '余额',
+                        '状态',
+                        '备注'
+                      ],
+                      rows: records
+                          .map((r) => [
+                                r.recordDate?.substring(0, 10) ?? '',
+                                r.typeLabel,
+                                r.partnerName ?? '',
+                                r.refType != null && r.refId != null
+                                    ? '${r.refType!.replaceAll('_', '-')}#${r.refId}'
+                                    : '',
+                                r.amount,
+                                r.balance,
+                                r.status == 'open' ? '未结清' : '已结清',
+                                r.remark ?? '',
+                              ])
+                          .toList(),
                     );
                   },
                   icon: const Icon(Icons.download, size: 16),
@@ -528,7 +550,8 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
     final amount = double.tryParse(_amountCtrl.text.trim());
     if (amount == null || amount <= 0) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('请输入有效金额'), backgroundColor: AppTheme.danger),
+        const SnackBar(
+            content: Text('请输入有效金额'), backgroundColor: AppTheme.danger),
       );
       return;
     }
@@ -537,15 +560,17 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
       final body = <String, dynamic>{
         'type': _type,
         'amount': amount,
-        'record_date': '${_date.year}-${_date.month.toString().padLeft(2, '0')}-${_date.day.toString().padLeft(2, '0')}',
-        if (_remarkCtrl.text.trim().isNotEmpty) 'remark': _remarkCtrl.text.trim(),
+        'record_date': formatYmd(_date),
+        if (_remarkCtrl.text.trim().isNotEmpty)
+          'remark': _remarkCtrl.text.trim(),
       };
       await widget.repo.create(body);
       if (mounted) {
         Navigator.of(context).pop();
         widget.onSaved();
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(content: Text('添加成功'), backgroundColor: AppTheme.success),
+          const SnackBar(
+              content: Text('添加成功'), backgroundColor: AppTheme.success),
         );
       }
     } catch (e) {
@@ -570,27 +595,19 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
           children: [
             TextField(
               controller: _amountCtrl,
-              keyboardType: const TextInputType.numberWithOptions(decimal: true),
-              decoration: const InputDecoration(labelText: '金额', prefixText: '¥ '),
+              keyboardType:
+                  const TextInputType.numberWithOptions(decimal: true),
+              decoration:
+                  const InputDecoration(labelText: '金额', prefixText: '¥ '),
             ),
             const SizedBox(height: 12),
-            InkWell(
-              onTap: () async {
-                final picked = await showDatePicker(
-                  context: context,
-                  initialDate: _date,
-                  firstDate: DateTime(2020),
-                  lastDate: DateTime.now().add(const Duration(days: 30)),
-                );
-                if (picked != null) setState(() => _date = picked);
+            DatePickerField(
+              label: '日期',
+              value: formatYmd(_date),
+              onChanged: (v) {
+                final d = parseYmd(v);
+                if (d != null) setState(() => _date = d);
               },
-              child: InputDecorator(
-                decoration: const InputDecoration(labelText: '日期'),
-                child: Text(
-                  '${_date.year}-${_date.month.toString().padLeft(2, '0')}-${_date.day.toString().padLeft(2, '0')}',
-                  style: const TextStyle(fontSize: 14),
-                ),
-              ),
             ),
             const SizedBox(height: 12),
             TextField(
@@ -609,8 +626,10 @@ class _AddPaymentDialogState extends State<_AddPaymentDialog> {
           onPressed: _saving ? null : _save,
           child: _saving
               ? const SizedBox(
-                  width: 16, height: 16,
-                  child: CircularProgressIndicator(strokeWidth: 2, color: Colors.white))
+                  width: 16,
+                  height: 16,
+                  child: CircularProgressIndicator(
+                      strokeWidth: 2, color: Colors.white))
               : const Text('保存'),
         ),
       ],
@@ -678,7 +697,8 @@ class _TypeBadge extends StatelessWidget {
       decoration:
           BoxDecoration(color: bg, borderRadius: BorderRadius.circular(3)),
       child: Text(label,
-          style: TextStyle(color: fg, fontSize: 12, fontWeight: FontWeight.w500)),
+          style:
+              TextStyle(color: fg, fontSize: 12, fontWeight: FontWeight.w500)),
     );
   }
 }
@@ -701,43 +721,41 @@ class _SummaryCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final card = Container(
-        height: 72,
-        padding: const EdgeInsets.symmetric(horizontal: 16),
-        decoration: BoxDecoration(
-          color: AppTheme.surface,
-          borderRadius: BorderRadius.circular(4),
-          border: Border.all(color: AppTheme.border, width: 0.5),
-        ),
-        child: Row(
-          children: [
-            Container(
-              width: 40,
-              height: 40,
-              decoration: BoxDecoration(
-                color: color.withOpacity(0.1),
-                borderRadius: BorderRadius.circular(8),
-              ),
-              child: Icon(icon, color: color, size: 22),
+      height: 72,
+      padding: const EdgeInsets.symmetric(horizontal: 16),
+      decoration: BoxDecoration(
+        color: AppTheme.surface,
+        borderRadius: BorderRadius.circular(4),
+        border: Border.all(color: AppTheme.border, width: 0.5),
+      ),
+      child: Row(
+        children: [
+          Container(
+            width: 40,
+            height: 40,
+            decoration: BoxDecoration(
+              color: color.withOpacity(0.1),
+              borderRadius: BorderRadius.circular(8),
             ),
-            const SizedBox(width: 12),
-            Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(title,
-                    style: const TextStyle(
-                        fontSize: 12, color: AppTheme.textSecondary)),
-                const SizedBox(height: 4),
-                Text(value,
-                    style: TextStyle(
-                        fontSize: 18,
-                        fontWeight: FontWeight.w700,
-                        color: color)),
-              ],
-            ),
-          ],
-        ),
-      );
+            child: Icon(icon, color: color, size: 22),
+          ),
+          const SizedBox(width: 12),
+          Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              Text(title,
+                  style: const TextStyle(
+                      fontSize: 12, color: AppTheme.textSecondary)),
+              const SizedBox(height: 4),
+              Text(value,
+                  style: TextStyle(
+                      fontSize: 18, fontWeight: FontWeight.w700, color: color)),
+            ],
+          ),
+        ],
+      ),
+    );
     return width != null
         ? SizedBox(width: width, child: card)
         : Expanded(child: card);

client/lib/screens/inventory/inventory_check_screen.dart

@@ -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))

client/lib/screens/inventory/inventory_list_screen.dart

@@ -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';
 

client/lib/screens/partners/partners_screen.dart

@@ -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);
           });
         },

client/lib/screens/settings/settings_screen.dart

@@ -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';
 

client/lib/screens/stock_out/stock_out_form_screen.dart

@@ -6,7 +6,11 @@ import '../../core/responsive/responsive.dart';
 import '../../core/theme/app_theme.dart';
 import '../../core/auth/auth_state.dart';
 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';
@@ -92,7 +96,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
   Future<void> _loadEditOrder() async {
     setState(() => _loadingEdit = true);
     try {
-      final order = await ref.read(stockOutRepositoryProvider).get(widget.editOrderId!);
+      final order =
+          await ref.read(stockOutRepositoryProvider).get(widget.editOrderId!);
 
       setState(() {
         _loadedOrder = order;
@@ -150,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!;
@@ -182,7 +189,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
       setState(() {
         _inventoryPickerItems = productMap.values.toList();
         _inventoryMap = {
-          for (final item in _inventoryPickerItems) item.productId: item.availableQty
+          for (final item in _inventoryPickerItems)
+            item.productId: item.availableQty
         };
       });
     } catch (_) {}
@@ -191,7 +199,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
   Future<void> _addItem() async {
     if (_warehouseId == null) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('请先选择出库仓库'), backgroundColor: AppTheme.danger),
+        const SnackBar(
+            content: Text('请先选择出库仓库'), backgroundColor: AppTheme.danger),
       );
       return;
     }
@@ -231,18 +240,20 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
     if (!asDraft && !_formKey.currentState!.validate()) return;
     if (_warehouseId == null) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('请选择出库仓库'), backgroundColor: AppTheme.danger),
+        const SnackBar(
+            content: Text('请选择出库仓库'), backgroundColor: AppTheme.danger),
       );
       return;
     }
     if (_items.isEmpty) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(content: Text('请添加商品明细'), backgroundColor: AppTheme.danger),
+        const SnackBar(
+            content: Text('请添加商品明细'), backgroundColor: AppTheme.danger),
       );
       return;
     }
-    final invalidQtyIndex = _items.indexWhere(
-        (item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0);
+    final invalidQtyIndex = _items
+        .indexWhere((item) => (double.tryParse(item.qtyCtrl.text) ?? 0) <= 0);
     if (invalidQtyIndex >= 0) {
       ScaffoldMessenger.of(context).showSnackBar(
         SnackBar(
@@ -269,8 +280,7 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
     final data = {
       'warehouse_id': _warehouseId,
       if (_partnerId != null) 'partner_id': _partnerId,
-      'order_date':
-          '${_orderDate.year}-${_orderDate.month.toString().padLeft(2, '0')}-${_orderDate.day.toString().padLeft(2, '0')}',
+      'order_date': formatYmd(_orderDate),
       if (_remarkCtrl.text.trim().isNotEmpty) 'remark': _remarkCtrl.text.trim(),
       'items': itemsData,
       'status': asDraft ? 'draft' : 'pending',
@@ -278,7 +288,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
 
     try {
       if (_isEdit) {
-        await ref.read(stockOutRepositoryProvider).update(widget.editOrderId!, data);
+        await ref
+            .read(stockOutRepositoryProvider)
+            .update(widget.editOrderId!, data);
         ref.read(stockOutListProvider.notifier).reload();
       } else {
         await ref.read(stockOutListProvider.notifier).createOrder(data);
@@ -303,6 +315,52 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
     }
   }
 
+  /// 是否有值得保留的录入（用于退出前判断是否提示保存草稿）。
+  bool get _isDirty {
+    if (_remarkCtrl.text.trim().isNotEmpty) return true;
+    if (_warehouseId != null) return true;
+    if (_partnerId != null) return true;
+    for (final item in _items) {
+      if (item.productId != null) return true;
+    }
+    return false;
+  }
+
+  /// 退出前处理：无录入直接离开；有未保存录入则提示「保存草稿 / 放弃 / 继续编辑」。
+  Future<void> _handleExit() async {
+    if (!_isDirty) {
+      context.go('/stock-out');
+      return;
+    }
+    final choice = await showDialog<String>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('未保存的内容'),
+        content:
+            Text(_isEdit ? '当前修改尚未保存。是否保存为草稿？' : '当前出库单尚未提交。是否保存为草稿，以免内容丢失？'),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop('edit'),
+            child: const Text('继续编辑'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop('discard'),
+            child: const Text('放弃', style: TextStyle(color: AppTheme.danger)),
+          ),
+          ElevatedButton(
+            onPressed: () => Navigator.of(ctx).pop('draft'),
+            child: const Text('保存草稿'),
+          ),
+        ],
+      ),
+    );
+    if (choice == 'draft') {
+      await _submit(true);
+    } else if (choice == 'discard' && mounted) {
+      context.go('/stock-out');
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final asyncWarehouses = ref.watch(warehouseListProvider);
@@ -310,320 +368,339 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
     final currentUser = ref.watch(authStateProvider).user;
     final isMobile = context.isMobile;
 
-    return Scaffold(
-      backgroundColor: AppTheme.background,
-      body: Column(
-        children: [
-          Container(
-            height: 52,
-            color: AppTheme.surface,
-            padding: const EdgeInsets.symmetric(horizontal: 16),
-            child: Row(
-              children: [
-                IconButton(
-                  icon: const Icon(Icons.arrow_back, size: 20),
-                  onPressed: () => context.go('/stock-out'),
-                  tooltip: '返回',
-                ),
-                const SizedBox(width: 8),
-                Text(_isEdit ? '修改出库单' : '新建出库单',
-                    style: const TextStyle(fontSize: 16, fontWeight: FontWeight.w600)),
-                const Spacer(),
-                // 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏
-                if (isMobile) ...[
-                  ElevatedButton(
-                    onPressed: _submitting ? null : () => _submit(false),
-                    child: _submitting
-                        ? const SizedBox(
-                            width: 14,
-                            height: 14,
-                            child: CircularProgressIndicator(
-                                strokeWidth: 2, color: Colors.white))
-                        : const Text('提交'),
+    return PopScope(
+      canPop: false,
+      onPopInvokedWithResult: (didPop, _) {
+        if (!didPop) _handleExit();
+      },
+      child: Scaffold(
+        backgroundColor: AppTheme.background,
+        body: Column(
+          children: [
+            Container(
+              height: 52,
+              color: AppTheme.surface,
+              padding: const EdgeInsets.symmetric(horizontal: 16),
+              child: Row(
+                children: [
+                  IconButton(
+                    icon: const Icon(Icons.arrow_back, size: 20),
+                    onPressed: _handleExit,
+                    tooltip: '返回',
                   ),
-                  PopupMenuButton<String>(
-                    onSelected: (v) {
-                      switch (v) {
-                        case 'draft':
-                          _submit(true);
-                          break;
-                        case 'print':
-                          _printOrder();
-                          break;
-                        case 'cancel':
-                          context.go('/stock-out');
-                          break;
-                      }
-                    },
-                    itemBuilder: (_) => [
-                      const PopupMenuItem(value: 'draft', child: Text('保存草稿')),
-                      if (_isEdit && _loadedOrder != null)
-                        const PopupMenuItem(value: 'print', child: Text('打印')),
-                      const PopupMenuItem(value: 'cancel', child: Text('取消')),
+                  const SizedBox(width: 8),
+                  Text(_isEdit ? '修改出库单' : '新建出库单',
+                      style: const TextStyle(
+                          fontSize: 16, fontWeight: FontWeight.w600)),
+                  const Spacer(),
+                  // 窄屏：仅保留主操作「提交」，其余收进溢出菜单，避免按钮挤爆顶栏
+                  if (isMobile) ...[
+                    ElevatedButton(
+                      onPressed: _submitting ? null : () => _submit(false),
+                      child: _submitting
+                          ? const SizedBox(
+                              width: 14,
+                              height: 14,
+                              child: CircularProgressIndicator(
+                                  strokeWidth: 2, color: Colors.white))
+                          : const Text('提交'),
+                    ),
+                    PopupMenuButton<String>(
+                      onSelected: (v) {
+                        switch (v) {
+                          case 'draft':
+                            _submit(true);
+                            break;
+                          case 'print':
+                            _printOrder();
+                            break;
+                          case 'cancel':
+                            _handleExit();
+                            break;
+                        }
+                      },
+                      itemBuilder: (_) => [
+                        const PopupMenuItem(
+                            value: 'draft', child: Text('保存草稿')),
+                        if (_isEdit && _loadedOrder != null)
+                          const PopupMenuItem(
+                              value: 'print', child: Text('打印')),
+                        const PopupMenuItem(value: 'cancel', child: Text('取消')),
+                      ],
+                    ),
+                  ] else ...[
+                    if (_isEdit && _loadedOrder != null) ...[
+                      OutlinedButton.icon(
+                        onPressed: _printOrder,
+                        icon: const Icon(Icons.print_outlined, size: 16),
+                        label: const Text('打印'),
+                      ),
+                      const SizedBox(width: 8),
                     ],
-                  ),
-                ] else ...[
-                  if (_isEdit && _loadedOrder != null) ...[
-                    OutlinedButton.icon(
-                      onPressed: _printOrder,
-                      icon: const Icon(Icons.print_outlined, size: 16),
-                      label: const Text('打印'),
+                    OutlinedButton(
+                      onPressed: _submitting ? null : () => _submit(true),
+                      child: const Text('保存草稿'),
                     ),
                     const SizedBox(width: 8),
+                    ElevatedButton.icon(
+                      onPressed: _submitting ? null : () => _submit(false),
+                      icon: _submitting
+                          ? const SizedBox(
+                              width: 14,
+                              height: 14,
+                              child: CircularProgressIndicator(
+                                  strokeWidth: 2, color: Colors.white))
+                          : const Icon(Icons.send, size: 16),
+                      label: const Text('提交审核'),
+                    ),
+                    const SizedBox(width: 8),
+                    OutlinedButton.icon(
+                      onPressed: _handleExit,
+                      icon: const Icon(Icons.cancel_outlined, size: 16),
+                      label: const Text('取消'),
+                    ),
                   ],
-                  OutlinedButton(
-                    onPressed: _submitting ? null : () => _submit(true),
-                    child: const Text('保存草稿'),
-                  ),
-                  const SizedBox(width: 8),
-                  ElevatedButton.icon(
-                    onPressed: _submitting ? null : () => _submit(false),
-                    icon: _submitting
-                        ? const SizedBox(
-                            width: 14,
-                            height: 14,
-                            child: CircularProgressIndicator(
-                                strokeWidth: 2, color: Colors.white))
-                        : const Icon(Icons.send, size: 16),
-                    label: const Text('提交审核'),
-                  ),
-                  const SizedBox(width: 8),
-                  OutlinedButton.icon(
-                    onPressed: () => context.go('/stock-out'),
-                    icon: const Icon(Icons.cancel_outlined, size: 16),
-                    label: const Text('取消'),
-                  ),
                 ],
-              ],
+              ),
             ),
-          ),
-          const Divider(height: 1),
-          if (_loadingEdit)
-            const Expanded(child: Center(child: CircularProgressIndicator())),
-          if (!_loadingEdit)
-            Expanded(
-              child: SingleChildScrollView(
-                padding: const EdgeInsets.all(16),
-                child: Form(
-                  key: _formKey,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      Card(
-                        child: Padding(
-                          padding: const EdgeInsets.all(16),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              const Text('基本信息',
-                                  style: TextStyle(
-                                      fontSize: 14,
-                                      fontWeight: FontWeight.w600,
-                                      color: AppTheme.primaryDark)),
-                              const SizedBox(height: 16),
-                              Wrap(
-                                spacing: 16,
-                                runSpacing: 16,
-                                children: [
-                                  _FormField(
-                                    label: '出库仓库',
-                                    required: true,
-                                    child: asyncWarehouses.when(
-                                      loading: () => 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))))
-                                            .toList(),
-                                        onChanged: (v) {
-                                          setState(() => _warehouseId = v);
-                                          if (v != null) _loadInventory(v);
-                                        },
-                                        validator: (v) => v == null ? '不能为空' : null,
-                                        decoration: const InputDecoration(),
-                                      ),
-                                    ),
-                                  ),
-                                  _FormField(
-                                    label: '客户',
-                                    child: asyncCustomers.when(
-                                      loading: () => 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))))
-                                            .toList(),
-                                        onChanged: (v) => setState(() => _partnerId = v),
-                                        decoration: const InputDecoration(),
-                                      ),
-                                    ),
-                                  ),
-                                  _FormField(
-                                    label: '出库员',
-                                    child: InputDecorator(
-                                      decoration: const InputDecoration(),
-                                      child: Text(
-                                        currentUser?.realName ?? '-',
-                                        style: const TextStyle(fontSize: 13),
-                                      ),
-                                    ),
-                                  ),
-                                  _FormField(
-                                    label: '出库日期',
-                                    required: true,
-                                    child: InkWell(
-                                      onTap: _pickDate,
-                                      child: InputDecorator(
-                                        decoration: const InputDecoration(),
-                                        child: Row(
-                                          children: [
-                                            Expanded(
-                                              child: Text(
-                                                '${_orderDate.year}-${_orderDate.month.toString().padLeft(2, '0')}-${_orderDate.day.toString().padLeft(2, '0')}',
-                                                style: const TextStyle(fontSize: 13),
-                                              ),
-                                            ),
-                                            const Icon(Icons.calendar_today,
-                                                size: 16, color: AppTheme.textSecondary),
-                                          ],
+            const Divider(height: 1),
+            if (_loadingEdit)
+              const Expanded(child: Center(child: CircularProgressIndicator())),
+            if (!_loadingEdit)
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.all(16),
+                  child: Form(
+                    key: _formKey,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Card(
+                          child: Padding(
+                            padding: const EdgeInsets.all(16),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                const Text('基本信息',
+                                    style: TextStyle(
+                                        fontSize: 14,
+                                        fontWeight: FontWeight.w600,
+                                        color: AppTheme.primaryDark)),
+                                const SizedBox(height: 16),
+                                Wrap(
+                                  spacing: 16,
+                                  runSpacing: 16,
+                                  children: [
+                                    _FormField(
+                                      label: '出库仓库',
+                                      required: true,
+                                      child: asyncWarehouses.when(
+                                        loading: () =>
+                                            const LinearProgressIndicator(),
+                                        error: (_, __) => const Text('加载失败'),
+                                        data: (warehouses) =>
+                                            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);
+                                          },
                                         ),
                                       ),
                                     ),
-                                  ),
-                                ],
-                              ),
-                              const SizedBox(height: 16),
-                              _FormField(
-                                label: '备注',
-                                width: double.infinity,
-                                child: TextFormField(
-                                  controller: _remarkCtrl,
-                                  maxLines: 2,
-                                  decoration: const InputDecoration(
-                                    hintText: '选填，如有特殊说明请在此注明',
-                                  ),
-                                ),
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 12),
-                      Card(
-                        child: Padding(
-                          padding: const EdgeInsets.all(16),
-                          child: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Row(
-                                children: [
-                                  const Text('商品明细',
-                                      style: TextStyle(
-                                          fontSize: 14,
-                                          fontWeight: FontWeight.w600,
-                                          color: AppTheme.primaryDark)),
-                                  const Spacer(),
-                                  ElevatedButton.icon(
-                                    onPressed: _addItem,
-                                    icon: const Icon(Icons.add, size: 16),
-                                    label: const Text('添加商品'),
-                                    style: ElevatedButton.styleFrom(
-                                        minimumSize: const Size(0, 32)),
-                                  ),
-                                ],
-                              ),
-                              const SizedBox(height: 12),
-                              // 窄屏：逐项卡片竖排，避免 9 列表格横向溢出；宽屏保持表格
-                              if (isMobile)
-                                Column(
-                                  children: List.generate(
-                                      _items.length,
-                                      (i) => Padding(
-                                            padding:
-                                                const EdgeInsets.only(bottom: 10),
-                                            child: _buildItemCard(i),
-                                          )),
-                                )
-                              else
-                                Table(
-                                  columnWidths: const {
-                                    0: FixedColumnWidth(36),   // 序号
-                                    1: FlexColumnWidth(1.2),   // 商品编码
-                                    2: FlexColumnWidth(2.0),   // 商品名称
-                                    3: FlexColumnWidth(1.2),   // 系列
-                                    4: FlexColumnWidth(1.2),   // 规格
-                                    5: FlexColumnWidth(1.0),   // 单价
-                                    6: FlexColumnWidth(0.8),   // 数量
-                                    7: FlexColumnWidth(1.0),   // 金额
-                                    8: FixedColumnWidth(48),   // 操作
-                                  },
-                                  children: [
-                                    TableRow(
-                                      decoration: const BoxDecoration(color: Color(0xFFF0F4FF)),
-                                      children: [
-                                        '序号', '商品编码', '商品名称', '系列', '规格', '单价', '数量', '金额', '操作',
-                                      ]
-                                          .map((h) => Padding(
-                                                padding: const EdgeInsets.symmetric(
-                                                    horizontal: 8, vertical: 10),
-                                                child: Text(h,
-                                                    style: const TextStyle(
-                                                        fontSize: 13,
-                                                        fontWeight: FontWeight.w600,
-                                                        color: AppTheme.primaryDark)),
-                                              ))
-                                          .toList(),
+                                    _FormField(
+                                      label: '客户',
+                                      child: asyncCustomers.when(
+                                        loading: () =>
+                                            const LinearProgressIndicator(),
+                                        error: (_, __) => const Text('加载失败'),
+                                        data: (result) =>
+                                            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),
+                                        ),
+                                      ),
+                                    ),
+                                    _FormField(
+                                      label: '出库员',
+                                      child: InputDecorator(
+                                        decoration: const InputDecoration(),
+                                        child: Text(
+                                          currentUser?.realName ?? '-',
+                                          style: const TextStyle(fontSize: 13),
+                                        ),
+                                      ),
+                                    ),
+                                    _FormField(
+                                      label: '出库日期',
+                                      required: true,
+                                      width: 320,
+                                      child: DatePickerField(
+                                        value: formatYmd(_orderDate),
+                                        onChanged: (v) {
+                                          final d = parseYmd(v);
+                                          if (d != null)
+                                            setState(() => _orderDate = d);
+                                        },
+                                      ),
                                     ),
-                                    ...List.generate(_items.length, (i) => _buildItemRow(i)),
                                   ],
                                 ),
-                              if (_items.isEmpty)
-                                const Padding(
-                                  padding: EdgeInsets.symmetric(vertical: 24),
-                                  child: Center(child: Text('暂无商品，点击"添加商品"从库存中选择',
-                                      style: TextStyle(color: AppTheme.textSecondary, fontSize: 13))),
+                                const SizedBox(height: 16),
+                                _FormField(
+                                  label: '备注',
+                                  width: double.infinity,
+                                  child: TextFormField(
+                                    controller: _remarkCtrl,
+                                    maxLines: 2,
+                                    decoration: const InputDecoration(
+                                      hintText: '选填，如有特殊说明请在此注明',
+                                    ),
+                                  ),
                                 ),
-                              const Divider(height: 1),
-                              Padding(
-                                padding: const EdgeInsets.only(top: 12),
-                                child: Row(
-                                  mainAxisAlignment: MainAxisAlignment.end,
+                              ],
+                            ),
+                          ),
+                        ),
+                        const SizedBox(height: 12),
+                        Card(
+                          child: Padding(
+                            padding: const EdgeInsets.all(16),
+                            child: Column(
+                              crossAxisAlignment: CrossAxisAlignment.start,
+                              children: [
+                                Row(
                                   children: [
-                                    const Text('合计金额：',
+                                    const Text('商品明细',
                                         style: TextStyle(
-                                            fontSize: 14, fontWeight: FontWeight.w500)),
-                                    Text(
-                                      '¥${_totalAmount.toStringAsFixed(2)}',
-                                      style: const TextStyle(
-                                          fontSize: 18,
-                                          fontWeight: FontWeight.w700,
-                                          color: AppTheme.danger),
+                                            fontSize: 14,
+                                            fontWeight: FontWeight.w600,
+                                            color: AppTheme.primaryDark)),
+                                    const Spacer(),
+                                    ElevatedButton.icon(
+                                      onPressed: _addItem,
+                                      icon: const Icon(Icons.add, size: 16),
+                                      label: const Text('添加商品'),
+                                      style: ElevatedButton.styleFrom(
+                                          minimumSize: const Size(0, 32)),
                                     ),
                                   ],
                                 ),
-                              ),
-                            ],
+                                const SizedBox(height: 12),
+                                // 窄屏：逐项卡片竖排，避免 9 列表格横向溢出；宽屏保持表格
+                                if (isMobile)
+                                  Column(
+                                    children: List.generate(
+                                        _items.length,
+                                        (i) => Padding(
+                                              padding: const EdgeInsets.only(
+                                                  bottom: 10),
+                                              child: _buildItemCard(i),
+                                            )),
+                                  )
+                                else
+                                  Table(
+                                    columnWidths: const {
+                                      0: FixedColumnWidth(36), // 序号
+                                      1: FlexColumnWidth(1.2), // 商品编码
+                                      2: FlexColumnWidth(2.0), // 商品名称
+                                      3: FlexColumnWidth(1.2), // 系列
+                                      4: FlexColumnWidth(1.2), // 规格
+                                      5: FlexColumnWidth(1.0), // 单价
+                                      6: FlexColumnWidth(0.8), // 数量
+                                      7: FlexColumnWidth(1.0), // 金额
+                                      8: FixedColumnWidth(48), // 操作
+                                    },
+                                    children: [
+                                      TableRow(
+                                        decoration: const BoxDecoration(
+                                            color: Color(0xFFF0F4FF)),
+                                        children: [
+                                          '序号',
+                                          '商品编码',
+                                          '商品名称',
+                                          '系列',
+                                          '规格',
+                                          '单价',
+                                          '数量',
+                                          '金额',
+                                          '操作',
+                                        ]
+                                            .map((h) => Padding(
+                                                  padding: const EdgeInsets
+                                                      .symmetric(
+                                                      horizontal: 8,
+                                                      vertical: 10),
+                                                  child: Text(h,
+                                                      style: const TextStyle(
+                                                          fontSize: 13,
+                                                          fontWeight:
+                                                              FontWeight.w600,
+                                                          color: AppTheme
+                                                              .primaryDark)),
+                                                ))
+                                            .toList(),
+                                      ),
+                                      ...List.generate(_items.length,
+                                          (i) => _buildItemRow(i)),
+                                    ],
+                                  ),
+                                if (_items.isEmpty)
+                                  const Padding(
+                                    padding: EdgeInsets.symmetric(vertical: 24),
+                                    child: Center(
+                                        child: Text('暂无商品，点击"添加商品"从库存中选择',
+                                            style: TextStyle(
+                                                color: AppTheme.textSecondary,
+                                                fontSize: 13))),
+                                  ),
+                                const Divider(height: 1),
+                                Padding(
+                                  padding: const EdgeInsets.only(top: 12),
+                                  child: Row(
+                                    mainAxisAlignment: MainAxisAlignment.end,
+                                    children: [
+                                      const Text('合计金额：',
+                                          style: TextStyle(
+                                              fontSize: 14,
+                                              fontWeight: FontWeight.w500)),
+                                      Text(
+                                        '¥${_totalAmount.toStringAsFixed(2)}',
+                                        style: const TextStyle(
+                                            fontSize: 18,
+                                            fontWeight: FontWeight.w700,
+                                            color: AppTheme.danger),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            ),
                           ),
                         ),
-                      ),
-                    ],
+                      ],
+                    ),
                   ),
                 ),
               ),
-            ),
-        ],
+          ],
+        ),
       ),
     );
   }
@@ -640,26 +717,39 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
       ),
       children: [
         // 序号
-        _cell(Text('${index + 1}', style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary))),
+        _cell(Text('${index + 1}',
+            style:
+                const TextStyle(fontSize: 13, color: AppTheme.textSecondary))),
         // 商品编码
-        _cell(Text(item.productCode, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
+        _cell(Text(item.productCode,
+            style:
+                const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
         // 商品名称
-        _cell(Text(item.productName, style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500), overflow: TextOverflow.ellipsis)),
+        _cell(Text(item.productName,
+            style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500),
+            overflow: TextOverflow.ellipsis)),
         // 系列
-        _cell(Text(item.series, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
+        _cell(Text(item.series,
+            style:
+                const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
         // 规格
-        _cell(Text(item.spec, style: const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
+        _cell(Text(item.spec,
+            style:
+                const TextStyle(fontSize: 12, color: AppTheme.textSecondary))),
         // 单价
-        _cell(Text(price > 0 ? '¥${price.toStringAsFixed(2)}' : '-', style: const TextStyle(fontSize: 13))),
+        _cell(Text(price > 0 ? '¥${price.toStringAsFixed(2)}' : '-',
+            style: const TextStyle(fontSize: 13))),
         // 数量
         Padding(padding: const EdgeInsets.all(4), child: _qtyField(item)),
         // 金额
-        _cell(Text('¥${amount.toStringAsFixed(2)}', style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500))),
+        _cell(Text('¥${amount.toStringAsFixed(2)}',
+            style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w500))),
         // 操作
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4),
           child: IconButton(
-            icon: const Icon(Icons.delete_outline, size: 18, color: AppTheme.danger),
+            icon: const Icon(Icons.delete_outline,
+                size: 18, color: AppTheme.danger),
             onPressed: () => _removeItem(index),
             tooltip: '删除',
             padding: EdgeInsets.zero,
@@ -676,7 +766,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
       decoration: const InputDecoration(hintText: '0', isDense: true),
       style: const TextStyle(fontSize: 13),
       keyboardType: const TextInputType.numberWithOptions(decimal: true),
-      inputFormatters: [FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}'))],
+      inputFormatters: [
+        FilteringTextInputFormatter.allow(RegExp(r'^\d+\.?\d{0,2}'))
+      ],
       onChanged: (_) => setState(() {}),
       validator: (v) {
         if (v == null || v.isEmpty) return '不能为空';
@@ -695,9 +787,11 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
 
     return MobileListCard(
       title: Text(item.productName),
-      subtitle: item.productCode.isNotEmpty ? Text('编码 ${item.productCode}') : null,
+      subtitle:
+          item.productCode.isNotEmpty ? Text('编码 ${item.productCode}') : null,
       trailing: IconButton(
-        icon: const Icon(Icons.delete_outline, size: 20, color: AppTheme.danger),
+        icon:
+            const Icon(Icons.delete_outline, size: 20, color: AppTheme.danger),
         onPressed: () => _removeItem(index),
         tooltip: '删除',
         visualDensity: VisualDensity.compact,
@@ -719,7 +813,8 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
 
   Widget _buildInventoryCell(int? productId, [double? available]) {
     if (productId == null) {
-      return _cell(const Text('-', style: TextStyle(color: AppTheme.textSecondary, fontSize: 13)));
+      return _cell(const Text('-',
+          style: TextStyle(color: AppTheme.textSecondary, fontSize: 13)));
     }
     final qty = available ?? _inventoryMap[productId];
     final text = qty != null
@@ -730,18 +825,9 @@ class _StockOutFormScreenState extends ConsumerState<StockOutFormScreen> {
         : qty <= 0
             ? AppTheme.danger
             : AppTheme.primary;
-    return _cell(Text(text, style: TextStyle(fontSize: 13, fontWeight: FontWeight.w700, color: color)));
-  }
-
-  Future<void> _pickDate() async {
-    final date = await showDatePicker(
-      context: context,
-      initialDate: _orderDate,
-      firstDate: DateTime(2020),
-      lastDate: DateTime(2030),
-      locale: const Locale('zh', 'CN'),
-    );
-    if (date != null) setState(() => _orderDate = date);
+    return _cell(Text(text,
+        style: TextStyle(
+            fontSize: 13, fontWeight: FontWeight.w700, color: color)));
   }
 }
 
@@ -763,9 +849,7 @@ class _FormField extends StatelessWidget {
     // 窄屏（手机）字段占满整行，便于点选；宽屏沿用固定宽度配合 Wrap 多列。
     final effectiveWidth = width == double.infinity
         ? double.infinity
-        : (context.isMobile
-            ? MediaQuery.sizeOf(context).width - 64
-            : width);
+        : (context.isMobile ? MediaQuery.sizeOf(context).width - 64 : width);
     return SizedBox(
       width: effectiveWidth,
       child: Column(
@@ -774,9 +858,11 @@ class _FormField extends StatelessWidget {
           Row(
             children: [
               if (required)
-                const Text('*', style: TextStyle(color: AppTheme.danger, fontSize: 13)),
+                const Text('*',
+                    style: TextStyle(color: AppTheme.danger, fontSize: 13)),
               Text(label,
-                  style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary)),
+                  style: const TextStyle(
+                      fontSize: 13, color: AppTheme.textSecondary)),
             ],
           ),
           const SizedBox(height: 6),
@@ -820,7 +906,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
   @override
   Widget build(BuildContext context) {
     final filtered = _filtered;
-    final allSelected = filtered.isNotEmpty && filtered.every((e) => _selected.contains(e.productId));
+    final allSelected = filtered.isNotEmpty &&
+        filtered.every((e) => _selected.contains(e.productId));
 
     return Dialog(
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
@@ -835,16 +922,19 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
               child: Row(
                 children: [
                   const Text('选择商品',
-                      style: TextStyle(fontSize: 15, fontWeight: FontWeight.w600)),
+                      style:
+                          TextStyle(fontSize: 15, fontWeight: FontWeight.w600)),
                   const SizedBox(width: 8),
                   Text('已选 ${_selected.length} 个',
-                      style: const TextStyle(fontSize: 13, color: AppTheme.textSecondary)),
+                      style: const TextStyle(
+                          fontSize: 13, color: AppTheme.textSecondary)),
                   const Spacer(),
                   IconButton(
                     icon: const Icon(Icons.close, size: 20),
                     onPressed: () => Navigator.pop(context),
                     padding: EdgeInsets.zero,
-                    constraints: const BoxConstraints(minWidth: 32, minHeight: 32),
+                    constraints:
+                        const BoxConstraints(minWidth: 32, minHeight: 32),
                   ),
                 ],
               ),
@@ -859,7 +949,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
                   hintText: '搜索商品编码、名称或系列',
                   prefixIcon: Icon(Icons.search, size: 18),
                   isDense: true,
-                  contentPadding: EdgeInsets.symmetric(horizontal: 12, vertical: 10),
+                  contentPadding:
+                      EdgeInsets.symmetric(horizontal: 12, vertical: 10),
                 ),
                 onChanged: (v) => setState(() => _search = v),
               ),
@@ -978,7 +1069,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
                         ? null
                         : () {
                             final result = widget.items
-                                .where((item) => _selected.contains(item.productId))
+                                .where((item) =>
+                                    _selected.contains(item.productId))
                                 .toList();
                             Navigator.pop(context, result);
                           },
@@ -1002,7 +1094,8 @@ class _InventoryPickerDialogState extends State<_InventoryPickerDialog> {
                 color: AppTheme.primaryDark)),
       );
 
-  Widget _dataCell(String text, double width, {Color? color, bool bold = false}) =>
+  Widget _dataCell(String text, double width,
+          {Color? color, bool bold = false}) =>
       SizedBox(
         width: width,
         child: Text(

client/lib/widgets/date_picker_field.dart

@@ -0,0 +1,179 @@
+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。
+class DatePickerField extends StatefulWidget {
+  final String? value; // yyyy-MM-dd
+  final ValueChanged<String?> onChanged;
+  final bool isRequired;
+  final String? label;
+
+  const DatePickerField({
+    super.key,
+    this.value,
+    required this.onChanged,
+    this.isRequired = false,
+    this.label,
+  });
+
+  @override
+  State<DatePickerField> createState() => _DatePickerFieldState();
+}
+
+class _DatePickerFieldState extends State<DatePickerField> {
+  int? _year;
+  int? _month;
+  int? _day;
+
+  @override
+  void initState() {
+    super.initState();
+    _parse(widget.value);
+  }
+
+  @override
+  void didUpdateWidget(DatePickerField old) {
+    super.didUpdateWidget(old);
+    if (old.value != widget.value) {
+      _parse(widget.value);
+    }
+  }
+
+  void _parse(String? v) {
+    final d = parseYmd(v);
+    _year = d?.year;
+    _month = d?.month;
+    _day = d?.day;
+  }
+
+  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;
+    }
+    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)
+          : 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);
+                    },
+                  ),
+                ),
+              ],
+            ),
+            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),
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}

client/lib/widgets/searchable_option_field.dart

@@ -13,8 +13,9 @@ class OptionItem {
   late final String _initials;
 
   OptionItem({required this.id, required this.name, this.code}) {
-    _fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '').toLowerCase();
-    _initials   = PinyinHelper.getShortPinyin(name).toLowerCase();
+    _fullPinyin = PinyinHelper.getPinyinE(name, separator: '', defPinyin: '')
+        .toLowerCase();
+    _initials = PinyinHelper.getShortPinyin(name).toLowerCase();
   }
 
   bool matches(String kw) {
@@ -36,6 +37,10 @@ class SearchableOptionField extends StatelessWidget {
   final bool isRequired;
   final bool isDense;
 
+  /// 可选：搜索无匹配时「新增到基础数据」。回调收到当前关键字（用户可在确认框里改），
+  /// 创建成功返回新选项 id（自动选中），失败/取消返回 null。为空则不显示新增入口。
+  final Future<int?> Function(String keyword)? onCreate;
+
   const SearchableOptionField({
     super.key,
     required this.options,
@@ -45,6 +50,7 @@ class SearchableOptionField extends StatelessWidget {
     required this.onChanged,
     this.isRequired = false,
     this.isDense = true,
+    this.onCreate,
   });
 
   String get _displayText {
@@ -59,6 +65,7 @@ class SearchableOptionField extends StatelessWidget {
         title: dialogTitle,
         options: options,
         selectedId: selectedId,
+        onCreate: onCreate,
       ),
     );
     // result == -1 means "clear selection"
@@ -86,9 +93,11 @@ class SearchableOptionField extends StatelessWidget {
               suffixIcon: selected
                   ? GestureDetector(
                       onTap: () => onChanged(null),
-                      child: const Icon(Icons.close, size: 14, color: AppTheme.textSecondary),
+                      child: const Icon(Icons.close,
+                          size: 14, color: AppTheme.textSecondary),
                     )
-                  : const Icon(Icons.arrow_drop_down, size: 16, color: AppTheme.textSecondary),
+                  : const Icon(Icons.arrow_drop_down,
+                      size: 16, color: AppTheme.textSecondary),
             ),
             isEmpty: !selected,
             child: Text(
@@ -110,7 +119,13 @@ class _SearchDialog extends StatefulWidget {
   final String title;
   final List<OptionItem> options;
   final int? selectedId;
-  const _SearchDialog({required this.title, required this.options, this.selectedId});
+  final Future<int?> Function(String keyword)? onCreate;
+  const _SearchDialog({
+    required this.title,
+    required this.options,
+    this.selectedId,
+    this.onCreate,
+  });
 
   @override
   State<_SearchDialog> createState() => _SearchDialogState();
@@ -119,6 +134,7 @@ class _SearchDialog extends StatefulWidget {
 class _SearchDialogState extends State<_SearchDialog> {
   final _ctrl = TextEditingController();
   String _keyword = '';
+  bool _creating = false;
 
   @override
   void dispose() {
@@ -126,11 +142,68 @@ class _SearchDialogState extends State<_SearchDialog> {
     super.dispose();
   }
 
+  /// 「新增到基础数据」流程：确认（名称可改）→ onCreate → 成功则带新 id 关闭搜索框。
+  Future<void> _createFlow() async {
+    final kw = _keyword.trim();
+    if (widget.onCreate == null || kw.isEmpty) return;
+    final nameCtrl = TextEditingController(text: kw);
+    final confirmed = await showAppDialog<bool>(
+      context: context,
+      builder: (_) => AlertDialog(
+        title: const Text('新增到基础数据', style: TextStyle(fontSize: 16)),
+        content: SizedBox(
+          width: context.dialogWidth(320),
+          child: TextField(
+            controller: nameCtrl,
+            autofocus: true,
+            decoration: const InputDecoration(labelText: '名称', isDense: true),
+          ),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(false),
+            child: const Text('取消'),
+          ),
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(true),
+            child: const Text('确认新增'),
+          ),
+        ],
+      ),
+    );
+    if (confirmed != true) return;
+    final name = nameCtrl.text.trim();
+    if (name.isEmpty) return;
+    setState(() => _creating = true);
+    try {
+      final newId = await widget.onCreate!(name);
+      if (!mounted) return;
+      if (newId != null) {
+        Navigator.of(context).pop(newId); // 回填并自动选中
+      } else {
+        setState(() => _creating = false);
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(content: Text('新增失败，请重试')),
+        );
+      }
+    } catch (e) {
+      if (!mounted) return;
+      setState(() => _creating = false);
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('新增失败：$e')),
+      );
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     final filtered = _keyword.isEmpty
         ? widget.options
         : widget.options.where((o) => o.matches(_keyword)).toList();
+    final kw = _keyword.trim();
+    final hasExact =
+        widget.options.any((o) => o.name.toLowerCase() == kw.toLowerCase());
+    final canCreate = widget.onCreate != null && kw.isNotEmpty && !hasExact;
 
     return AlertDialog(
       title: Text(widget.title, style: const TextStyle(fontSize: 16)),
@@ -153,8 +226,12 @@ class _SearchDialogState extends State<_SearchDialog> {
             const SizedBox(height: 8),
             Expanded(
               child: filtered.isEmpty
-                  ? const Center(
-                      child: Text('无匹配结果', style: TextStyle(color: AppTheme.textSecondary)))
+                  ? Center(
+                      child: Text(
+                        canCreate ? '无匹配结果，可新增到基础数据' : '无匹配结果',
+                        style: const TextStyle(color: AppTheme.textSecondary),
+                      ),
+                    )
                   : ListView.builder(
                       itemCount: filtered.length,
                       itemBuilder: (_, i) {
@@ -162,17 +239,36 @@ class _SearchDialogState extends State<_SearchDialog> {
                         final isSelected = opt.id == widget.selectedId;
                         return ListTile(
                           dense: true,
-                          title: Text(opt.name, style: const TextStyle(fontSize: 13)),
+                          title: Text(opt.name,
+                              style: const TextStyle(fontSize: 13)),
                           subtitle: opt.code != null && opt.code!.isNotEmpty
-                              ? Text(opt.code!, style: const TextStyle(fontSize: 11))
+                              ? Text(opt.code!,
+                                  style: const TextStyle(fontSize: 11))
                               : null,
                           selected: isSelected,
-                          selectedTileColor: AppTheme.primary.withValues(alpha: 0.08),
+                          selectedTileColor:
+                              AppTheme.primary.withValues(alpha: 0.08),
                           onTap: () => Navigator.of(context).pop(opt.id),
                         );
                       },
                     ),
             ),
+            if (canCreate)
+              Align(
+                alignment: Alignment.centerLeft,
+                child: TextButton.icon(
+                  onPressed: _creating ? null : _createFlow,
+                  icon: _creating
+                      ? const SizedBox(
+                          width: 14,
+                          height: 14,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Icon(Icons.add, size: 16),
+                  label: Text('新增「$kw」到基础数据',
+                      style: const TextStyle(fontSize: 12)),
+                ),
+              ),
           ],
         ),
       ),
@@ -180,7 +276,8 @@ class _SearchDialogState extends State<_SearchDialog> {
         if (widget.selectedId != null)
           TextButton(
             onPressed: () => Navigator.of(context).pop(-1),
-            child: const Text('清除选择', style: TextStyle(color: AppTheme.textSecondary)),
+            child: const Text('清除选择',
+                style: TextStyle(color: AppTheme.textSecondary)),
           ),
         TextButton(
           onPressed: () => Navigator.of(context).pop(null),

client/macos/Runner.xcodeproj/project.pbxproj

@@ -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";

client/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -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"
+        }
+    ]
+}

client/macos/Runner/Configs/AppInfo.xcconfig

@@ -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.

client/macos/Runner/Info.plist

@@ -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>

client/pubspec.lock

@@ -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:

client/pubspec.yaml

@@ -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

client/test/date_picker_field_test.dart

@@ -0,0 +1,56 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:jiu_client/core/utils/date_util.dart';
+import 'package:jiu_client/widgets/date_picker_field.dart';
+
+void main() {
+  group('date_util', () {
+    test('formatYmd 补零', () {
+      expect(formatYmd(DateTime(2026, 6, 9)), '2026-06-09');
+      expect(formatYmd(DateTime(2026, 12, 31)), '2026-12-31');
+    });
+    test('parseYmd 解析/容错', () {
+      expect(parseYmd('2026-06-19'), DateTime(2026, 6, 19));
+      expect(parseYmd('2026-06-19T08:00:00'), DateTime(2026, 6, 19));
+      expect(parseYmd(null), isNull);
+      expect(parseYmd(''), isNull);
+    });
+    test('composeYmd 正常组合', () {
+      expect(composeYmd(2026, 6, 15), '2026-06-15');
+    });
+    test('composeYmd 把超界的日 clamp 回当月最大值', () {
+      expect(composeYmd(2026, 2, 31), '2026-02-28'); // 平年 2 月
+      expect(composeYmd(2024, 2, 31), '2024-02-29'); // 闰年 2 月
+      expect(composeYmd(2026, 4, 31), '2026-04-30'); // 4 月 30 天
+    });
+    test('composeYmd 任一为空返回 null', () {
+      expect(composeYmd(null, 6, 15), isNull);
+      expect(composeYmd(2026, null, 15), isNull);
+      expect(composeYmd(2026, 6, null), isNull);
+    });
+  });
+
+  group('DatePickerField', () {
+    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));
+    });
+
+    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);
+    });
+  });
+}

client/test/searchable_option_create_test.dart

@@ -0,0 +1,59 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:jiu_client/widgets/searchable_option_field.dart';
+
+void main() {
+  Widget host({
+    required ValueChanged<int?> onChanged,
+    Future<int?> Function(String)? onCreate,
+  }) {
+    return MaterialApp(
+      home: Scaffold(
+        body: SearchableOptionField(
+          options: [OptionItem(id: 1, name: '53度')],
+          selectedId: null,
+          hint: '选择系列',
+          dialogTitle: '选择系列',
+          onChanged: onChanged,
+          onCreate: onCreate,
+        ),
+      ),
+    );
+  }
+
+  testWidgets('搜不到时显示「新增到基础数据」入口', (tester) async {
+    await tester.pumpWidget(host(onChanged: (_) {}, onCreate: (_) async => 99));
+    // 打开搜索对话框
+    await tester.tap(find.byType(SearchableOptionField));
+    await tester.pumpAndSettle();
+    // 输入不存在的关键字
+    await tester.enterText(find.byType(TextField).first, '52度');
+    await tester.pumpAndSettle();
+    expect(find.textContaining('新增「52度」到基础数据'), findsOneWidget);
+  });
+
+  testWidgets('确认新增后回填选中新 id', (tester) async {
+    int? selected;
+    await tester.pumpWidget(
+        host(onChanged: (v) => selected = v, onCreate: (_) async => 99));
+    await tester.tap(find.byType(SearchableOptionField));
+    await tester.pumpAndSettle();
+    await tester.enterText(find.byType(TextField).first, '52度');
+    await tester.pumpAndSettle();
+    await tester.tap(find.textContaining('新增「52度」到基础数据'));
+    await tester.pumpAndSettle();
+    // 确认框
+    await tester.tap(find.text('确认新增'));
+    await tester.pumpAndSettle();
+    expect(selected, 99);
+  });
+
+  testWidgets('未提供 onCreate 时不显示新增入口', (tester) async {
+    await tester.pumpWidget(host(onChanged: (_) {}));
+    await tester.tap(find.byType(SearchableOptionField));
+    await tester.pumpAndSettle();
+    await tester.enterText(find.byType(TextField).first, '52度');
+    await tester.pumpAndSettle();
+    expect(find.textContaining('新增'), findsNothing);
+  });
+}

client/web/index.html

@@ -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>

client/web/manifest.json

@@ -1,6 +1,6 @@
 {
-    "name": "岩美",
-    "short_name": "岩美",
+    "name": "岩美酒库",
+    "short_name": "岩美酒库",
     "start_url": ".",
     "display": "standalone",
     "background_color": "#2563AC",
@@ -32,4 +32,4 @@
             "purpose": "maskable"
         }
     ]
-}
+}

client/windows/runner/Runner.rc

@@ -89,13 +89,13 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.yanmei" "\0"
-            VALUE "FileDescription", "jiu_client" "\0"
+            VALUE "CompanyName", "岩美技术有限公司" "\0"
+            VALUE "FileDescription", "岩美酒库" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "jiu_client" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2026 com.yanmei. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2026 岩美技术有限公司. All rights reserved." "\0"
             VALUE "OriginalFilename", "jiu_client.exe" "\0"
-            VALUE "ProductName", "jiu_client" "\0"
+            VALUE "ProductName", "岩美酒库" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END