feat: 完成WMS系统权限体系与业务功能迭代

本提交完成了WMS系统的多维度优化升级： 1. 新增RBAC权限系统，支持角色/菜单/按钮三级权限管控 2. 重构库存盘点、物料管理、区域维护等模块的查询筛选与展示逻辑 3. 优化入库/出库/质检等业务流程，完善数据冗余与业务闭环 4. 移除旧装箱表，将装箱逻辑合并到出库主表 5. 新增前端权限判断工具、导出工具与端到端测试用例 6. 补充完善各类注释与数据库字段说明
2026-09-03 14:20:37 +08:00
parent 665ff257dc
commit 572fa975bc
101 changed files with 14531 additions and 4692 deletions
@@ -2,6 +2,7 @@ package handler

 import (
 	"net/http"
+	"time"

 	"bj_power_wms/ent"
 	"bj_power_wms/ent/inbounddetail"
@@ -215,59 +216,172 @@ func createInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {

 // excelInboundHandler 实现见 excel.go

-// queryInboundHandler 入库单查询
+// inboundRow 列表/导出统一结构：入库单 + 明细总数。
+// 注意：明细(批次/SN)不在此内嵌——精密件单可能上万条 SN，
+// 列表查询若一次性加载全部明细会撑爆内存，故只带总数，明细按需分页加载。
+type inboundRow struct {
+	*ent.InboundOrder
+	DetailCount int `json:"detailCount"`
+}
+
+// applyInboundFilters 统一列表与导出的筛选条件
+// 结构件(manageMode=1)与精密件(manageMode=2)同主表(inbound_order)，按 manageMode 区分类型
+func applyInboundFilters(q *ent.InboundOrderQuery, r *http.Request) *ent.InboundOrderQuery {
+	if v := r.URL.Query().Get("inboundNo"); v != "" {
+		q = q.Where(inboundorder.InboundNoContains(v))
+	}
+	if v := r.URL.Query().Get("materialCode"); v != "" {
+		q = q.Where(inboundorder.MaterialCodeContains(v))
+	}
+	if v := r.URL.Query().Get("manageMode"); v != "" {
+		if m := atoi(v, 0); m != 0 {
+			q = q.Where(inboundorder.ManageModeEQ(m))
+		}
+	}
+	if v := r.URL.Query().Get("inboundType"); v != "" {
+		q = q.Where(inboundorder.InboundTypeEQ(v))
+	}
+	if v := r.URL.Query().Get("keyword"); v != "" {
+		kw := v
+		q = q.Where(inboundorder.Or(
+			inboundorder.MaterialCodeContains(kw),
+			inboundorder.InboundNoContains(kw),
+			inboundorder.MaterialNameContains(kw),
+		))
+	}
+	if v := r.URL.Query().Get("startDate"); v != "" {
+		if t, err := time.ParseInLocation("2006-01-02", v, time.Local); err == nil {
+			q = q.Where(inboundorder.CreatedAtGTE(t.Unix()))
+		}
+	}
+	if v := r.URL.Query().Get("endDate"); v != "" {
+		if t, err := time.ParseInLocation("2006-01-02", v, time.Local); err == nil {
+			// 含当天全天
+			q = q.Where(inboundorder.CreatedAtLTE(t.Add(24 * time.Hour).Unix()))
+		}
+	}
+	return q
+}
+
+// buildInboundRows 仅组装入库单 + 各单明细总数（count，代价极低，不加载明细内容）
+func buildInboundRows(ctx *svc.ServiceContext, list []*ent.InboundOrder) []inboundRow {
+	rows := make([]inboundRow, 0, len(list))
+	for _, ib := range list {
+		cnt, _ := ctx.EntClient.InboundDetail.Query().
+			Where(inbounddetail.InboundNoEQ(ib.InboundNo)).Count(ctx0())
+		rows = append(rows, inboundRow{ib, cnt})
+	}
+	return rows
+}
+
+// inboundDetailsHandler 入库单明细分页查询（批次/SN）。
+// 单独接口、按需加载、分页返回——避免一次拉取上万条 SN 撑爆内存/前端。
+// 参数：inboundNo(必填) page pageSize(默认 50)
+func inboundDetailsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		inboundNo := r.URL.Query().Get("inboundNo")
+		if inboundNo == "" {
+			fail(w, http.StatusBadRequest, "inboundNo 必填")
+			return
+		}
+		page := atoi(r.URL.Query().Get("page"), 1)
+		pageSize := atoi(r.URL.Query().Get("pageSize"), 50)
+		if page < 1 {
+			page = 1
+		}
+		if pageSize < 1 || pageSize > 500 {
+			pageSize = 50
+		}
+		q := ctx.EntClient.InboundDetail.Query().
+			Where(inbounddetail.InboundNoEQ(inboundNo))
+		total, err := q.Count(ctx0())
+		if err != nil {
+			fail(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		list, err := q.Order(ent.Desc("created_at")).
+			Offset((page - 1) * pageSize).Limit(pageSize).All(ctx0())
+		if err != nil {
+			fail(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		ok(w, map[string]any{
+			"total":    total,
+			"list":     list,
+			"page":     page,
+			"pageSize": pageSize,
+		})
+	}
+}
+
+// queryInboundHandler 入库单查询（分页列表）
+// 结构件/精密件同主表，默认返回全部；支持多条件筛选。
 func queryInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		page := atoi(r.URL.Query().Get("page"), 1)
 		pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
-		materialCode := r.URL.Query().Get("materialCode")
-		inboundType := r.URL.Query().Get("inboundType")
-		inboundNo := r.URL.Query().Get("inboundNo")
-
+		if page < 1 {
+			page = 1
+		}
+		if pageSize < 1 {
+			pageSize = 20
+		}
 		q := ctx.EntClient.InboundOrder.Query()
-		if materialCode != "" {
-			q = q.Where(inboundorder.MaterialCodeEQ(materialCode))
-		}
-		if inboundType != "" {
-			q = q.Where(inboundorder.InboundTypeEQ(inboundType))
-		}
-		if inboundNo != "" {
-			q = q.Where(inboundorder.InboundNoEQ(inboundNo))
-		}
+		q = applyInboundFilters(q, r)

 		total, err := q.Count(ctx0())
 		if err != nil {
 			fail(w, http.StatusInternalServerError, err.Error())
 			return
 		}
-		list, err := q.Order(ent.Desc("id")).
+		list, err := q.Order(ent.Desc("created_at")).
 			Offset((page - 1) * pageSize).Limit(pageSize).All(ctx0())
 		if err != nil {
 			fail(w, http.StatusInternalServerError, err.Error())
 			return
 		}

-		type row struct {
-			*ent.InboundOrder
-			Details []*ent.InboundDetail `json:"details"`
-		}
-		rows := make([]row, 0, len(list))
-		for _, ib := range list {
-			details, _ := ctx.EntClient.InboundDetail.Query().
-				Where(inbounddetail.InboundNoEQ(ib.InboundNo)).
-				All(ctx0())
-			rows = append(rows, row{ib, details})
-		}
-
 		ok(w, map[string]any{
 			"total":    total,
-			"list":     rows,
+			"list":     buildInboundRows(ctx, list),
 			"page":     page,
 			"pageSize": pageSize,
 		})
 	}
 }

+// exportInboundHandler 入库单导出：按筛选条件返回全部（不分页），前端转 CSV，
+// 与 /api/outbound/export 保持一致。
+func exportInboundHandler(ctx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		q := ctx.EntClient.InboundOrder.Query()
+		q = applyInboundFilters(q, r)
+		list, err := q.Order(ent.Desc("created_at")).All(ctx0())
+		if err != nil {
+			fail(w, http.StatusInternalServerError, err.Error())
+			return
+		}
+		rows := buildInboundRows(ctx, list)
+		// xlsx 导出：格式化 = xlsx → 直接生成二进制文件；否则保持 JSON 兼容
+		if r.URL.Query().Get("format") == "xlsx" {
+			headers := []string{"入库单号", "物料编码", "物料名称", "类型", "数量", "区域", "操作人", "备注", "明细条数", "入库时间"}
+			matrix := make([][]any, 0, len(rows))
+			for _, row := range rows {
+				ib := row.InboundOrder
+				matrix = append(matrix, []any{
+					ib.InboundNo, ib.MaterialCode, ib.MaterialName,
+					manageModeLabel(ib.ManageMode), ib.Quantity, ib.ZoneCode,
+					ib.Operator, ib.Remark, row.DetailCount,
+					unixFmt(ib.CreatedAt),
+				})
+			}
+			sendExcel(w, xlsxFilename("入库管理"), headers, matrix)
+			return
+		}
+		ok(w, map[string]any{"total": len(rows), "list": rows})
+	}
+}
+
 // genBatchNo 生成批次号：日期 + 自增
 func genBatchNo(materialCode string) string {
 	// TODO: 使用数据库序列或 Redis INCR 保证自增唯一