SunYF/bj_power
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
本提交完成了WMS系统的多维度优化升级：
1. 新增RBAC权限系统，支持角色/菜单/按钮三级权限管控
2. 重构库存盘点、物料管理、区域维护等模块的查询筛选与展示逻辑
3. 优化入库/出库/质检等业务流程，完善数据冗余与业务闭环
4. 移除旧装箱表，将装箱逻辑合并到出库主表
5. 新增前端权限判断工具、导出工具与端到端测试用例
6. 补充完善各类注释与数据库字段说明
This commit is contained in:
SunYF
2026-09-03 14:20:37 +08:00
parent 665ff257dc
commit 572fa975bc
101 changed files with 14531 additions and 4692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bj_power_wms/internal/handler/misc.go
+3 -155
View File
@@ -1,19 +1,17 @@
package handler
import (
"encoding/json"
"net/http"
"strconv"
"strings"
"bj_power_wms/ent"
"bj_power_wms/ent/ordermaterialledger"
"bj_power_wms/ent/packagebox"
"bj_power_wms/ent/semifinished"
"bj_power_wms/internal/svc"
)
// 半成品 / 包装 / 台账 相关（盘点见 stocktake.go）
// 半成品 / 台账 相关（盘点见 stocktake.go）
// semiInboundHandler 半成品入库（携带已完成工序）
// 与 MES 闭环：MES 工位报工暂存退库时调用本接口，把半成品 SN 入 WMS 库。
@@ -139,7 +137,7 @@ func querySemiHandler(ctx *svc.ServiceContext) http.HandlerFunc {
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())
@@ -155,156 +153,6 @@ func querySemiHandler(ctx *svc.ServiceContext) http.HandlerFunc {
}
}
// packageBindHandler 装箱绑定（箱号 ↔ SN），支持合同号
func packageBindHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
BoxNo string `json:"boxNo"`
SnList []string `json:"snList"`
MaterialCode string `json:"materialCode"`
ContractNo string `json:"contractNo"`
Operator string `json:"operator"`
Remark string `json:"remark"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.BoxNo == "" || len(req.SnList) == 0 {
fail(w, http.StatusBadRequest, "箱号和 SN 清单必填")
return
}
exists, err := ctx.EntClient.PackageBox.Query().
Where(packagebox.BoxNoEQ(req.BoxNo)).
Exist(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return
}
if exists {
fail(w, http.StatusConflict, "箱号已存在: "+req.BoxNo)
return
}
// SN 列表序列化
snJSON := toJSON(req.SnList)
pkg, err := ctx.EntClient.PackageBox.Create().
SetBoxNo(req.BoxNo).
SetSnList(snJSON).
SetNillableMaterialCode(strPtr(req.MaterialCode)).
SetQuantity(len(req.SnList)).
SetNillableContractNo(strPtr(req.ContractNo)).
SetNillableOperator(strPtr(req.Operator)).
SetNillableRemark(strPtr(req.Remark)).
Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return
}
ok(w, pkg)
}
}
// packageUpdateHandler 编辑装箱（重新装箱 SN / 修改合同号等）
func packageUpdateHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
ID int `json:"id"`
SnList []string `json:"snList"`
MaterialCode string `json:"materialCode"`
ContractNo string `json:"contractNo"`
Operator string `json:"operator"`
Remark string `json:"remark"`
}
if err := parseJSON(r, &req); err != nil || req.ID <= 0 {
fail(w, http.StatusBadRequest, "参数错误")
return
}
upd := ctx.EntClient.PackageBox.UpdateOneID(req.ID)
if len(req.SnList) > 0 {
upd.SetSnList(toJSON(req.SnList)).SetQuantity(len(req.SnList))
}
upd.SetNillableMaterialCode(strPtr(req.MaterialCode)).
SetNillableContractNo(strPtr(req.ContractNo)).
SetNillableOperator(strPtr(req.Operator)).
SetNillableRemark(strPtr(req.Remark))
pkg, err := upd.Save(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, "更新装箱失败: "+err.Error())
return
}
ok(w, pkg)
}
}
// toJSON 序列化任意值为 JSON 字符串
func toJSON(v any) string {
b, err := json.Marshal(v)
if err != nil {
return "[]"
}
return string(b)
}
// queryPackageHandler 装箱查询（多条件：箱号/合同号/操作人/物料/时间范围）
func queryPackageHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
boxNo := r.URL.Query().Get("boxNo")
contractNo := r.URL.Query().Get("contractNo")
operator := r.URL.Query().Get("operator")
materialCode := r.URL.Query().Get("materialCode")
startAt := r.URL.Query().Get("startAt")
endAt := r.URL.Query().Get("endAt")
page := atoi(r.URL.Query().Get("page"), 1)
pageSize := atoi(r.URL.Query().Get("pageSize"), 20)
q := ctx.EntClient.PackageBox.Query()
if boxNo != "" {
q = q.Where(packagebox.BoxNoContains(boxNo))
}
if contractNo != "" {
q = q.Where(packagebox.ContractNoContains(contractNo))
}
if operator != "" {
q = q.Where(packagebox.OperatorContains(operator))
}
if materialCode != "" {
q = q.Where(packagebox.MaterialCodeEQ(materialCode))
}
if startAt != "" {
start := atoi64(startAt, 0)
if start > 0 {
q = q.Where(packagebox.CreatedAtGTE(start))
}
}
if endAt != "" {
end := atoi64(endAt, 0)
if end > 0 {
q = q.Where(packagebox.CreatedAtLTE(end))
}
}
total, err := q.Count(ctx0())
if err != nil {
fail(w, http.StatusInternalServerError, err.Error())
return
}
list, err := q.Order(ent.Desc("id")).
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,
})
}
}
// ledger 相关：queryLedgerHandler 工单物料台账查询
func queryLedgerHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
@@ -325,7 +173,7 @@ func queryLedgerHandler(ctx *svc.ServiceContext) http.HandlerFunc {
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())