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/material"
|
||||
@@ -117,10 +118,27 @@ func queryMaterialsHandler(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")
|
||||
templateCode := r.URL.Query().Get("templateCode")
|
||||
materialCode := r.URL.Query().Get("materialCode")
|
||||
name := r.URL.Query().Get("name")
|
||||
spec := r.URL.Query().Get("spec")
|
||||
manageMode := atoi(r.URL.Query().Get("manageMode"), 0)
|
||||
startDate := r.URL.Query().Get("startDate")
|
||||
endDate := r.URL.Query().Get("endDate")
|
||||
keyword := r.URL.Query().Get("keyword") // 兼容旧版,作为物料编码/名称兜底
|
||||
|
||||
q := ctx.EntClient.Material.Query()
|
||||
if materialCode != "" {
|
||||
q = q.Where(material.CodeContains(materialCode))
|
||||
}
|
||||
if name != "" {
|
||||
q = q.Where(material.NameContains(name))
|
||||
}
|
||||
if spec != "" {
|
||||
q = q.Where(material.SpecContains(spec))
|
||||
}
|
||||
if manageMode != 0 {
|
||||
q = q.Where(material.ManageModeEQ(manageMode))
|
||||
}
|
||||
if keyword != "" {
|
||||
q = q.Where(
|
||||
material.Or(
|
||||
@@ -129,8 +147,15 @@ func queryMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
),
|
||||
)
|
||||
}
|
||||
if templateCode != "" {
|
||||
q = q.Where(material.TemplateCodeEQ(templateCode))
|
||||
if startDate != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", startDate, time.Local); err == nil {
|
||||
q = q.Where(material.CreatedAtGTE(t.Unix()))
|
||||
}
|
||||
}
|
||||
if endDate != "" {
|
||||
if t, err := time.ParseInLocation("2006-01-02", endDate, time.Local); err == nil {
|
||||
q = q.Where(material.CreatedAtLTE(t.Add(24 * time.Hour).Unix()))
|
||||
}
|
||||
}
|
||||
|
||||
total, err := q.Count(ctx0())
|
||||
@@ -139,7 +164,7 @@ func queryMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
list, err := q.Order(ent.Desc("id")).
|
||||
list, err := q.Order(ent.Desc("created_at")).
|
||||
Offset((page - 1) * pageSize).
|
||||
Limit(pageSize).
|
||||
All(ctx0())
|
||||
@@ -160,7 +185,7 @@ func queryMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// listMaterialsHandler 下拉框全量列表(不翻页)
|
||||
func listMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
list, err := ctx.EntClient.Material.Query().Order(ent.Desc("id")).All(ctx0())
|
||||
list, err := ctx.EntClient.Material.Query().Order(ent.Desc("created_at")).All(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user