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

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

.gitea/workflows/backup.yml

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

CHANGELOG-client.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.65] - 2026-06-21
+
+### 改进
+- 入库录入改为「每行一个独立产品」：每条明细对应一个独立编号，同名同规格录多次也各自独立（配合后端 server-v1.0.69）
+
 ## [1.0.64] - 2026-06-20
 
 ### 新功能

CHANGELOG-server.md

@@ -5,6 +5,11 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.69] - 2026-06-21
+
+### 改进
+- 入库录入改为「每行一个独立产品」：每条明细新建独立商品、发独立序列号（同名同规格录多次也各自独立），不再复用已有商品编号，符合"每个货品一个唯一编号"的管理方式
+
 ## [1.0.68] - 2026-06-21
 
 ### 修复

backend/internal/handler/product.go

@@ -85,6 +85,42 @@ func nextProductCode(tx *gorm.DB, shopID uint64) (string, error) {
 	return fmt.Sprintf("P%03d", maxN+1), nil
 }
 
+// createIndependentProduct 为入库明细新建一个独立产品（特有产品/序列号），返回新 product。
+// "入库每行 = 一个特有产品"模型:每条明细建一个独立 product、发新序列号,不按名称复用。
+// 含 nextProductCode 自增 + 撞 uk_shop_code 唯一约束时重试。必须在事务内调用。
+func createIndependentProduct(tx *gorm.DB, shopID uint64, name, series, spec, batchNo string, prodDate *model.Date, price float64) (model.Product, error) {
+	namePinyin, nameInitials := util.ToPinyin(name)
+	var prod model.Product
+	var err error
+	for attempt := 0; attempt < 5; attempt++ {
+		code, e := nextProductCode(tx, shopID)
+		if e != nil {
+			return model.Product{}, e
+		}
+		prod = model.Product{
+			TenantBase:     model.TenantBase{ShopID: shopID},
+			PublicID:       uuid.New().String(),
+			Code:           code,
+			Name:           name,
+			Series:         series,
+			Spec:           spec,
+			BatchNo:        batchNo,
+			ProductionDate: prodDate,
+			PurchasePrice:  price,
+			NamePinyin:     namePinyin,
+			NameInitials:   nameInitials,
+		}
+		prod.ID = 0
+		if err = tx.Create(&prod).Error; err == nil || !errors.Is(err, gorm.ErrDuplicatedKey) {
+			break
+		}
+	}
+	if err != nil {
+		return model.Product{}, err
+	}
+	return prod, nil
+}
+
 // Create POST /api/v1/products
 func (h *ProductHandler) Create(c *gin.Context) {
 	shopID := middleware.GetShopID(c)

backend/internal/handler/stock_in.go

@@ -106,19 +106,28 @@ func (h *StockInHandler) Create(c *gin.Context) {
 	}
 	req.OrderNo = orderNo
 
-	// 计算总金额；自动生成批次号
+	// 事务内：每条明细新建一个独立产品（特有产品/序列号，不按名称复用），回填 product_id，再建单。
-	var total float64
+	err = h.db.Transaction(func(tx *gorm.DB) error {
-	for i := range req.Items {
+		var total float64
-		req.Items[i].ShopID = shopID
+		for i := range req.Items {
-		req.Items[i].TotalPrice = req.Items[i].Quantity * req.Items[i].UnitPrice
+			it := &req.Items[i]
-		total += req.Items[i].TotalPrice
+			it.ShopID = shopID
-		if req.Items[i].BatchNo == "" {
+			if it.BatchNo == "" {
-			req.Items[i].BatchNo = fmt.Sprintf("%s-%02d", req.OrderNo, i+1)
+				it.BatchNo = fmt.Sprintf("%s-%02d", req.OrderNo, i+1)
+			}
+			prod, e := createIndependentProduct(tx, shopID, it.ProductName, it.Series, it.Spec, it.BatchNo, it.ProductionDate, it.UnitPrice)
+			if e != nil {
+				return e
+			}
+			it.ProductID = prod.ID
+			it.ProductCode = prod.Code // 保留快照,兼容现有查询(瘦身阶段再去)
+			it.TotalPrice = it.Quantity * it.UnitPrice
+			total += it.TotalPrice
 		}
-	}
+		req.TotalAmount = total
-	req.TotalAmount = total
+		return tx.Create(&req).Error
-
+	})
-	if err := h.db.Create(&req).Error; err != nil {
+	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
@@ -148,13 +157,20 @@ func (h *StockInHandler) Update(c *gin.Context) {
 		}
 		var total float64
 		for i := range req.Items {
-			req.Items[i].ShopID = shopID
+			it := &req.Items[i]
-			req.Items[i].OrderID = order.ID
+			it.ShopID = shopID
-			req.Items[i].TotalPrice = req.Items[i].Quantity * req.Items[i].UnitPrice
+			it.OrderID = order.ID
-			total += req.Items[i].TotalPrice
+			if it.BatchNo == "" {
-			if req.Items[i].BatchNo == "" {
+				it.BatchNo = fmt.Sprintf("%s-%02d", order.OrderNo, i+1)
-				req.Items[i].BatchNo = fmt.Sprintf("%s-%02d", order.OrderNo, i+1)
 			}
+			// 编辑草稿:旧明细已删,每条按新模型重建独立产品（旧草稿 product 无库存,暂留待后续清理）
+			prod, e := createIndependentProduct(tx, shopID, it.ProductName, it.Series, it.Spec, it.BatchNo, it.ProductionDate, it.UnitPrice)
+			if e != nil {
+				return e
+			}
+			it.ProductID = prod.ID
+			it.ProductCode = prod.Code
+			it.TotalPrice = it.Quantity * it.UnitPrice
 		}
 		updates := map[string]interface{}{
 			"warehouse_id": req.WarehouseID,

backend/internal/handler/stock_in_test.go

@@ -28,9 +28,11 @@ func TestStockInHandler_FullFlow(t *testing.T) {
 		"order_date":   time.Now().Format(time.RFC3339),
 		"items": []map[string]interface{}{
 			{
-				"product_id": product.ID,
+				"product_name": "Test Beer",
-				"quantity":   10.0,
+				"series":       "普通",
-				"unit_price": 5.0,
+				"spec":         "500ml",
+				"quantity":     10.0,
+				"unit_price":   5.0,
 			},
 		},
 	})
@@ -57,15 +59,17 @@ func TestStockInHandler_FullFlow(t *testing.T) {
 	w = makeRequest(r, "PUT", fmt.Sprintf("/api/v1/stock-in/orders/%d/approve", orderID), token, nil)
 	require.Equal(t, http.StatusOK, w.Code)
 
-	// 5. 验证库存变化
+	// 5. 验证库存变化：入库为明细新建了独立产品，库存指向它（不是预设的 product）
 	var inv model.Inventory
-	db.Where("shop_id = ? AND warehouse_id = ? AND product_id = ?",
+	db.Where("shop_id = ? AND warehouse_id = ?",
-		shop.ID, warehouse.ID, product.ID).First(&inv)
+		shop.ID, warehouse.ID).First(&inv)
 	assert.Equal(t, float64(10), inv.Quantity)
+	assert.NotZero(t, inv.ProductID)
+	assert.NotEqual(t, product.ID, inv.ProductID)
 
 	// 6. 验证库存流水
 	var logs []model.InventoryLog
-	db.Where("shop_id = ? AND product_id = ?", shop.ID, product.ID).Find(&logs)
+	db.Where("shop_id = ? AND product_id = ?", shop.ID, inv.ProductID).Find(&logs)
 	require.Len(t, logs, 1)
 	assert.Equal(t, "in", logs[0].Direction)
 	assert.Equal(t, float64(10), logs[0].Quantity)

backend/internal/model/product.go

@@ -22,6 +22,9 @@ type Product struct {
 	Brand         string  `gorm:"size:100" json:"brand"`
 	PurchasePrice float64 `gorm:"type:decimal(12,2)" json:"purchase_price"`
 	SalePrice     float64 `gorm:"type:decimal(12,2)" json:"sale_price"`
+	// 特有产品的批次属性：每个 product = 一个特有产品/序列号，生产日期/批次归此（单一来源）
+	ProductionDate *Date  `gorm:"type:date" json:"production_date"`
+	BatchNo        string `gorm:"size:50" json:"batch_no"`
 	MinStock      int     `gorm:"default:0" json:"min_stock"`
 	Description   string  `gorm:"type:text" json:"description"`
 	CustomFields    JSON    `gorm:"type:json" json:"custom_fields,omitempty"`

backend/testutil/setup.go

@@ -188,6 +188,8 @@ func SetupTestDB() *gorm.DB {
 			brand TEXT,
 			purchase_price REAL,
 			sale_price REAL,
+			production_date DATETIME,
+			batch_no TEXT,
 			min_stock INTEGER DEFAULT 0,
 			description TEXT,
 			custom_fields TEXT,

client/lib/screens/stock_in/stock_in_form_screen.dart

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

scripts/ci/backup-db.sh

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