fix(backend): 入库审核库存沿用明细真实快照名 + 库存列表过滤软删商品，修复历史导入占位顶替；入库/出库列表支持 keyword 搜索

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

CHANGELOG-server.md

@@ -5,6 +5,20 @@
 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.67] - 2026-06-20
+
+### 修复
+- 历史导入单审核入库后，库存里商品显示为「历史导入占位」、按真实名搜不到的问题：审核生成库存时改用单据明细自带的真实商品名/编码/系列/规格，库存列表也不再显示已删除的占位商品名
+- 库存列表按真实商品名/编码即可搜到这些历史商品
+
+### 新功能
+- 入库单 / 出库单列表支持关键词搜索：按单号或往来单位名称即时筛选
+
+## [1.0.66] - 2026-06-20
+
+### 修复
+- 入库/出库单据列表改为按业务日期（入库/出库日期）倒序排列：从旧系统迁入的历史单据按真实日期归位到列表顶部，不再因录入时间晚、被排到末尾分页而在首页遗漏
+
 ## [1.0.65] - 2026-06-20
 
 ### 修复

backend/internal/handler/inventory.go

@@ -68,7 +68,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 	specStr := c.Query("spec")
 
 	if keyword != "" {
-		baseWhere += " AND (COALESCE(NULLIF(p.name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
+		baseWhere += " AND (COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name) LIKE ? OR COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code) LIKE ? OR p.name_pinyin LIKE ? OR p.name_initials LIKE ?)"
 		like := "%" + keyword + "%"
 		args = append(args, like, like, like, like)
 	}
@@ -101,7 +101,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		SELECT COUNT(*)
 		FROM inventories inv
 		LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
-		LEFT JOIN products p ON p.id = inv.product_id
+		LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
 		LEFT JOIN warehouses w ON w.id = inv.warehouse_id
 		WHERE ` + baseWhere
 
@@ -116,10 +116,10 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		SELECT
 		  inv.id, inv.shop_id, inv.warehouse_id, inv.product_id, inv.stock_in_item_id,
 		  inv.quantity,
-		  COALESCE(NULLIF(p.code,''), inv.product_code, '') AS product_code,
-		  COALESCE(NULLIF(p.name,''), inv.product_name, '') AS product_name,
-		  COALESCE(NULLIF(p.series,''), inv.series, '') AS series,
-		  COALESCE(NULLIF(p.spec,''), inv.spec, '') AS spec,
+		  COALESCE(NULLIF(p.code,''), NULLIF(sii.product_code,''), inv.product_code, '') AS product_code,
+		  COALESCE(NULLIF(p.name,''), NULLIF(sii.product_name,''), inv.product_name, '') AS product_name,
+		  COALESCE(NULLIF(p.series,''), NULLIF(sii.series,''), inv.series, '') AS series,
+		  COALESCE(NULLIF(p.spec,''), NULLIF(sii.spec,''), inv.spec, '') AS spec,
 		  COALESCE(NULLIF(p.unit,''), inv.unit, '') AS unit,
 		  COALESCE(NULLIF(w.name,''), inv.warehouse_name, '') AS warehouse_name,
 		  COALESCE(sii.unit_price, inv.unit_price) AS unit_price,
@@ -132,7 +132,7 @@ func (h *InventoryHandler) List(c *gin.Context) {
 		  inv.created_at
 		FROM inventories inv
 		LEFT JOIN stock_in_items sii ON sii.id = inv.stock_in_item_id
-		LEFT JOIN products p ON p.id = inv.product_id
+		LEFT JOIN products p ON p.id = inv.product_id AND p.deleted_at IS NULL
 		LEFT JOIN warehouses w ON w.id = inv.warehouse_id
 		WHERE ` + baseWhere + `
 		ORDER BY inv.id DESC

backend/internal/handler/inventory_test.go

@@ -219,6 +219,52 @@ func TestInventoryHandler_List_HotelIsolation(t *testing.T) {
 	assert.Equal(t, float64(0), respB["total"].(float64))
 }
 
+// 库存指向已软删的占位商品时，列表应回退到明细/库存快照真名，
+// 而非占位商品名「历史导入占位」，且能按真名搜索到。
+func TestInventoryHandler_List_DeletedProductFallsBackToSnapshot(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "INV009")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 明细携带真实快照名
+	item := model.StockInItem{
+		ShopID:      shop.ID,
+		ProductID:   placeholder.ID,
+		ProductCode: "ZXZ029751",
+		ProductName: "贵州茅台酒2006",
+		Quantity:    10,
+	}
+	require.NoError(t, db.Create(&item).Error)
+
+	// 库存：product_id 指向占位商品，且 product_name 也是占位名（模拟旧脏数据）
+	require.NoError(t, db.Create(&model.Inventory{
+		ShopID:        shop.ID,
+		WarehouseID:   &warehouse.ID,
+		ProductID:     &placeholder.ID,
+		StockInItemID: &item.ID,
+		ProductName:   "历史导入占位",
+		Quantity:      10,
+	}).Error)
+
+	// 软删占位商品
+	require.NoError(t, db.Delete(&placeholder).Error)
+
+	// 列表：名称应回退到明细快照真名
+	w := makeRequest(r, "GET", "/api/v1/inventory", token, nil)
+	resp := parseResponse(w)
+	require.Equal(t, float64(1), resp["total"].(float64))
+	invItem := resp["data"].([]interface{})[0].(map[string]interface{})
+	assert.Equal(t, "贵州茅台酒2006", invItem["product_name"])
+
+	// 按真名可搜到
+	w = makeRequest(r, "GET", "/api/v1/inventory?keyword=茅台", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+}
+
 func TestInventoryHandler_AfterStockInApprove(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "INV008")

backend/internal/handler/stock_in.go

@@ -49,6 +49,13 @@ func (h *StockInHandler) List(c *gin.Context) {
 	if endDate := c.Query("end_date"); endDate != "" {
 		query = query.Where("order_date <= ?", endDate)
 	}
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		query = query.Where(
+			"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
+			like, shopID, like,
+		)
+	}
 
 	var total int64
 	query.Count(&total)
@@ -56,7 +63,7 @@ func (h *StockInHandler) List(c *gin.Context) {
 	orders := make([]model.StockInOrder, 0)
 	query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
 		Offset((page - 1) * pageSize).Limit(pageSize).
-		Order("id DESC").Find(&orders)
+		Order("order_date DESC, id DESC").Find(&orders)
 
 	c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
 }

backend/internal/handler/stock_in_test.go

@@ -308,6 +308,51 @@ func TestStockInHandler_Reject_NotPending(t *testing.T) {
 	assert.Equal(t, http.StatusBadRequest, w.Code)
 }
 
+func TestStockInHandler_List_FilterByKeyword(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "SI011")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	product := testutil.CreateTestProduct(db, shop.ID, "Brandy")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 往来单位：茅台供应商
+	partner := &model.Partner{Code: "P001", Name: "茅台供应商", Type: "supplier"}
+	partner.ShopID = shop.ID
+	require.NoError(t, db.Create(partner).Error)
+
+	// 单据1：挂往来单位
+	w := makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"partner_id":   partner.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 5.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+	order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
+
+	// 单据2：无往来单位
+	w = makeRequest(r, "POST", "/api/v1/stock-in/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 3.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+
+	// 按往来单位名搜索 → 只命中单据1
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword=茅台", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 按单号搜索 → 只命中单据1
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders?keyword="+order1No, token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 无关键词 → 两条都在
+	w = makeRequest(r, "GET", "/api/v1/stock-in/orders", token, nil)
+	assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
+}
+
 func TestStockInHandler_List_FilterByStatus(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SI010")

backend/internal/handler/stock_out.go

@@ -42,6 +42,13 @@ func (h *StockOutHandler) List(c *gin.Context) {
 	if endDate := c.Query("end_date"); endDate != "" {
 		query = query.Where("order_date <= ?", endDate)
 	}
+	if kw := strings.TrimSpace(c.Query("keyword")); kw != "" {
+		like := "%" + kw + "%"
+		query = query.Where(
+			"order_no LIKE ? OR partner_id IN (SELECT id FROM partners WHERE shop_id = ? AND name LIKE ?)",
+			like, shopID, like,
+		)
+	}
 
 	var total int64
 	query.Count(&total)
@@ -49,7 +56,7 @@ func (h *StockOutHandler) List(c *gin.Context) {
 	orders := make([]model.StockOutOrder, 0)
 	query.Preload("Warehouse").Preload("Partner").Preload("Operator").Preload("Reviewer").
 		Offset((page - 1) * pageSize).Limit(pageSize).
-		Order("id DESC").Find(&orders)
+		Order("order_date DESC, id DESC").Find(&orders)
 
 	c.JSON(http.StatusOK, gin.H{"data": orders, "total": total, "page": page, "page_size": pageSize})
 }

backend/internal/handler/stock_out_test.go

@@ -133,6 +133,51 @@ func TestStockOutHandler_List(t *testing.T) {
 	assert.Equal(t, float64(2), resp["total"].(float64))
 }
 
+func TestStockOutHandler_List_FilterByKeyword(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "SO011")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	product := testutil.CreateTestProduct(db, shop.ID, "Beer")
+	token := getAuthToken(user.ID, shop.ID, "admin")
+	r := setupProtectedRouter(db)
+
+	// 往来单位：海底捞客户
+	partner := &model.Partner{Code: "C001", Name: "海底捞客户", Type: "customer"}
+	partner.ShopID = shop.ID
+	require.NoError(t, db.Create(partner).Error)
+
+	// 单据1：挂往来单位
+	w := makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"partner_id":   partner.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+	order1No := parseResponse(w)["data"].(map[string]interface{})["order_no"].(string)
+
+	// 单据2：无往来单位
+	w = makeRequest(r, "POST", "/api/v1/stock-out/orders", token, map[string]interface{}{
+		"warehouse_id": warehouse.ID,
+		"order_date":   time.Now().Format(time.RFC3339),
+		"items":        []map[string]interface{}{{"product_id": product.ID, "quantity": 1.0}},
+	})
+	require.Equal(t, http.StatusCreated, w.Code)
+
+	// 按往来单位名搜索
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword=海底捞", token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 按单号搜索
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders?keyword="+order1No, token, nil)
+	assert.Equal(t, float64(1), parseResponse(w)["total"].(float64))
+
+	// 无关键词
+	w = makeRequest(r, "GET", "/api/v1/stock-out/orders", token, nil)
+	assert.Equal(t, float64(2), parseResponse(w)["total"].(float64))
+}
+
 func TestStockOutHandler_Reject(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "SO004")

backend/internal/service/stock.go

@@ -64,16 +64,26 @@ func (s *StockService) ApproveStockIn(shopID, orderID, reviewerID uint64) error
 				unitPricePtr = &itemCopy.UnitPrice
 			}
 
-			productCode := ""
-			productName := ""
-			series := ""
-			spec := ""
+			// 优先使用明细自带快照列（历史导入单的真实商品信息在此），
+			// Product 关联仅作兜底（普通 UI 录入单的明细快照为空）。
+			productCode := itemCopy.ProductCode
+			productName := itemCopy.ProductName
+			series := itemCopy.Series
+			spec := itemCopy.Spec
 			unit := ""
 			if itemCopy.Product != nil {
-				productCode = itemCopy.Product.Code
-				productName = itemCopy.Product.Name
-				series = itemCopy.Product.Series
-				spec = itemCopy.Product.Spec
+				if productCode == "" {
+					productCode = itemCopy.Product.Code
+				}
+				if productName == "" {
+					productName = itemCopy.Product.Name
+				}
+				if series == "" {
+					series = itemCopy.Product.Series
+				}
+				if spec == "" {
+					spec = itemCopy.Product.Spec
+				}
 				unit = itemCopy.Product.Unit
 			}
 

backend/internal/service/stock_test.go

@@ -65,6 +65,47 @@ func TestStockService_ApproveStockIn_Success(t *testing.T) {
 	assert.Equal(t, float64(10), logs[0].QtyAfter)
 }
 
+// 历史导入单：明细自带真实快照名，product_id 指向占位商品（名「历史导入占位」）。
+// 审核生成的库存应使用明细快照真名，而非占位商品名。
+func TestStockService_ApproveStockIn_PrefersItemSnapshot(t *testing.T) {
+	db := testutil.SetupTestDB()
+	shop := testutil.CreateTestShop(db, "STOCK009")
+	warehouse := testutil.CreateTestWarehouse(db, shop.ID, "Warehouse")
+	placeholder := testutil.CreateTestProduct(db, shop.ID, "历史导入占位")
+	user := testutil.CreateTestUser(db, shop.ID, "admin", "pass", "admin")
+
+	order := model.StockInOrder{
+		TenantBase:  model.TenantBase{ShopID: shop.ID},
+		OrderNo:     "IN20240101000009",
+		WarehouseID: warehouse.ID,
+		OperatorID:  user.ID,
+		Status:      "pending",
+		OrderDate:   model.Date{Time: time.Now()},
+		Items: []model.StockInItem{
+			{
+				ShopID:      shop.ID,
+				ProductID:   placeholder.ID,
+				ProductCode: "ZXZ029751",
+				ProductName: "贵州茅台酒2006",
+				Series:      "茅台",
+				Spec:        "500ml",
+				Quantity:    10,
+			},
+		},
+	}
+	require.NoError(t, db.Create(&order).Error)
+
+	svc := NewStockService(db)
+	require.NoError(t, svc.ApproveStockIn(shop.ID, order.ID, user.ID))
+
+	var inv model.Inventory
+	require.NoError(t, db.Where("shop_id = ? AND product_id = ?", shop.ID, placeholder.ID).First(&inv).Error)
+	assert.Equal(t, "贵州茅台酒2006", inv.ProductName)
+	assert.Equal(t, "ZXZ029751", inv.ProductCode)
+	assert.Equal(t, "茅台", inv.Series)
+	assert.Equal(t, "500ml", inv.Spec)
+}
+
 func TestStockService_ApproveStockIn_NotPending(t *testing.T) {
 	db := testutil.SetupTestDB()
 	shop := testutil.CreateTestShop(db, "STOCK002")