feat: 完成WMS系统权限体系与业务功能迭代
本提交完成了WMS系统的多维度优化升级: 1. 新增RBAC权限系统,支持角色/菜单/按钮三级权限管控 2. 重构库存盘点、物料管理、区域维护等模块的查询筛选与展示逻辑 3. 优化入库/出库/质检等业务流程,完善数据冗余与业务闭环 4. 移除旧装箱表,将装箱逻辑合并到出库主表 5. 新增前端权限判断工具、导出工具与端到端测试用例 6. 补充完善各类注释与数据库字段说明
This commit is contained in:
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/zone"
|
||||
@@ -87,9 +88,23 @@ func listZonesHandler(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)
|
||||
keyword := r.URL.Query().Get("keyword")
|
||||
zoneCode := r.URL.Query().Get("zoneCode")
|
||||
zoneName := r.URL.Query().Get("zoneName")
|
||||
status := r.URL.Query().Get("status")
|
||||
startDate := r.URL.Query().Get("startDate")
|
||||
endDate := r.URL.Query().Get("endDate")
|
||||
keyword := r.URL.Query().Get("keyword") // 兼容旧版,作为区域编码/名称兜底
|
||||
|
||||
q := ctx.EntClient.Zone.Query()
|
||||
if zoneCode != "" {
|
||||
q = q.Where(zone.ZoneCodeContains(zoneCode))
|
||||
}
|
||||
if zoneName != "" {
|
||||
q = q.Where(zone.ZoneNameContains(zoneName))
|
||||
}
|
||||
if status != "" {
|
||||
q = q.Where(zone.StatusEQ(status))
|
||||
}
|
||||
if keyword != "" {
|
||||
q = q.Where(
|
||||
zone.Or(
|
||||
@@ -98,12 +113,22 @@ func listZonesHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
),
|
||||
)
|
||||
}
|
||||
if startDate != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", startDate, time.Local); err == nil {
|
||||
q = q.Where(zone.CreatedAtGTE(t.Unix()))
|
||||
}
|
||||
}
|
||||
if endDate != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", endDate, time.Local); err == nil {
|
||||
q = q.Where(zone.CreatedAtLTE(t.Add(24 * time.Hour).Unix()))
|
||||
}
|
||||
}
|
||||
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())
|
||||
|
||||
Reference in New Issue
Block a user