feat: 完成7项功能任务

后端： - fix(backend): InventoryLog 增加 Product/Warehouse 关联，Logs 接口加 Preload 修复流水记录显示"-" - feat(backend): 新增 /inventory/batches 批次追踪接口 - feat(backend): 新增财务记录、编号规则接口（finance、number_rule handler） - fix(backend): service/stock_test.go 修复 model.Date 类型错误前端： - feat(client): 入库/出库管理 Tab 调换顺序（审核在前），审核 Tab 加新建按钮，列表 Tab 无按钮 - feat(client): 入库单/出库单增加详情弹窗，显示完整单据信息和商品明细 - feat(client): 完善出库单新建表单（StockOutFormScreen），支持选客户/仓库/商品 - fix(client): StockInItem/StockOutItem.fromJson 修复读取嵌套 product 对象而非平铺字段 - feat(client): 批次追踪页面（BatchTrackingScreen）及侧边栏入口 - feat(client): 财务管理、盘点、编号规则接入真实后端 API - fix(client): 入库/出库审核通过后 invalidate inventoryListProvider 刷新库存 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-10 22:03:19 +08:00
parent 5f8e7cfa7e
commit ce1cbf404c
28 changed files with 2507 additions and 1072 deletions
@@ -0,0 +1,63 @@
+package handler
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"github.com/wangjia/jiu/backend/internal/middleware"
+	"github.com/wangjia/jiu/backend/internal/model"
+)
+
+type FinanceHandler struct {
+	db *gorm.DB
+}
+
+func NewFinanceHandler(db *gorm.DB) *FinanceHandler {
+	return &FinanceHandler{db: db}
+}
+
+// ListRecords GET /api/v1/finance/records
+func (h *FinanceHandler) ListRecords(c *gin.Context) {
+	shopID := middleware.GetShopID(c)
+
+	var q struct {
+		Type     string `form:"type"`
+		Month    string `form:"month"` // e.g. "2026-04"
+		Page     int    `form:"page,default=1"`
+		PageSize int    `form:"page_size,default=50"`
+	}
+	if err := c.ShouldBindQuery(&q); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+	if q.PageSize <= 0 {
+		q.PageSize = 50
+	}
+	if q.Page <= 0 {
+		q.Page = 1
+	}
+
+	base := h.db.Model(&model.FinanceRecord{}).Where("shop_id = ?", shopID)
+	if q.Type != "" {
+		base = base.Where("type = ?", q.Type)
+	}
+	if q.Month != "" {
+		base = base.Where("DATE_FORMAT(record_date, '%Y-%m') = ?", q.Month)
+	}
+
+	var total int64
+	base.Count(&total)
+
+	var records []model.FinanceRecord
+	offset := (q.Page - 1) * q.PageSize
+	base.Preload("Partner").Order("record_date DESC, id DESC").Offset(offset).Limit(q.PageSize).Find(&records)
+
+	c.JSON(http.StatusOK, gin.H{
+		"data":      records,
+		"total":     total,
+		"page":      q.Page,
+		"page_size": q.PageSize,
+	})
+}
@@ -64,11 +64,46 @@ func (h *InventoryHandler) Logs(c *gin.Context) {
 	query.Count(&total)

 	var logs []model.InventoryLog
-	query.Offset((page - 1) * pageSize).Limit(pageSize).Order("id DESC").Find(&logs)
+	query.Preload("Product").Preload("Warehouse").Offset((page-1)*pageSize).Limit(pageSize).Order("id DESC").Find(&logs)

 	c.JSON(http.StatusOK, gin.H{"data": logs, "total": total, "page": page, "page_size": pageSize})
 }

+// Batches GET /api/v1/inventory/batches — 批次追踪：已审核入库单的明细行
+func (h *InventoryHandler) Batches(c *gin.Context) {
+	shopID := middleware.GetShopID(c)
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
+
+	// 查询已审核的入库单明细，关联商品和仓库信息
+	query := h.db.Model(&model.StockInItem{}).
+		Joins("JOIN stock_in_orders ON stock_in_orders.id = stock_in_items.order_id").
+		Where("stock_in_orders.shop_id = ? AND stock_in_orders.status = 'approved'", shopID)
+
+	if productID := c.Query("product_id"); productID != "" {
+		query = query.Where("stock_in_items.product_id = ?", productID)
+	}
+	if warehouseID := c.Query("warehouse_id"); warehouseID != "" {
+		query = query.Where("stock_in_orders.warehouse_id = ?", warehouseID)
+	}
+
+	var total int64
+	query.Count(&total)
+
+	var items []model.StockInItem
+	query.
+		Preload("Product").
+		Preload("Order", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("Warehouse").Preload("Partner")
+		}).
+		Select("stock_in_items.*").
+		Order("stock_in_orders.order_date DESC, stock_in_items.id DESC").
+		Offset((page - 1) * pageSize).Limit(pageSize).
+		Find(&items)
+
+	c.JSON(http.StatusOK, gin.H{"data": items, "total": total, "page": page, "page_size": pageSize})
+}
+
 // CreateCheck POST /api/v1/inventory/checks
 func (h *InventoryHandler) CreateCheck(c *gin.Context) {
 	shopID := middleware.GetShopID(c)
@@ -0,0 +1,66 @@
+package handler
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+
+	"github.com/wangjia/jiu/backend/internal/middleware"
+	"github.com/wangjia/jiu/backend/internal/model"
+)
+
+type NumberRuleHandler struct {
+	db *gorm.DB
+}
+
+func NewNumberRuleHandler(db *gorm.DB) *NumberRuleHandler {
+	return &NumberRuleHandler{db: db}
+}
+
+// List GET /api/v1/number-rules
+func (h *NumberRuleHandler) List(c *gin.Context) {
+	shopID := middleware.GetShopID(c)
+	var rules []model.NumberRule
+	h.db.Where("shop_id = ?", shopID).Order("id").Find(&rules)
+	c.JSON(http.StatusOK, gin.H{"data": rules})
+}
+
+// Update PUT /api/v1/number-rules/:id
+func (h *NumberRuleHandler) Update(c *gin.Context) {
+	shopID := middleware.GetShopID(c)
+	id := c.Param("id")
+
+	var rule model.NumberRule
+	if err := h.db.Where("id = ? AND shop_id = ?", id, shopID).First(&rule).Error; err != nil {
+		c.JSON(http.StatusNotFound, gin.H{"error": "not found"})
+		return
+	}
+
+	var req struct {
+		Prefix     string `json:"prefix"`
+		CurrentNo  *int   `json:"current_no"`
+		DateFormat string `json:"date_format"`
+	}
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		return
+	}
+
+	updates := map[string]any{}
+	if req.Prefix != "" {
+		updates["prefix"] = req.Prefix
+	}
+	if req.CurrentNo != nil {
+		updates["current_no"] = *req.CurrentNo
+	}
+	if req.DateFormat != "" {
+		updates["date_format"] = req.DateFormat
+	}
+
+	if err := h.db.Model(&rule).Updates(updates).Error; err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+		return
+	}
+	c.JSON(http.StatusOK, gin.H{"data": rule})
+}