feat: 两库对等物料管理及产品工号贯通全流程
- 新增 MES 本地物料表及双向同步接口,WMS 物料变更自动同步 - 全流程新增产品工号字段,贯通入库/库存/出库/检验环节 - 工单管理支持多工单混产,移除单工单互斥限制 - 新增批次号/SN 字段支持质量检验联动 WMS 库存处置 - 修复权限规则,仅内置管理员账号不允许修改删除 - 工位终端新增 SN 扫码自动切换所属工单功能
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
@@ -16,6 +17,24 @@ import (
|
||||
// 密码最小长度(注册 / 改密 / 重置统一)
|
||||
const minPasswordLen = 6
|
||||
|
||||
// checkPasswordStrong 校验密码:长度>=6 且不能是纯数字(与 MES 一致)
|
||||
func checkPasswordStrong(pwd string) error {
|
||||
if len(pwd) < minPasswordLen {
|
||||
return errors.New("密码长度至少 6 位")
|
||||
}
|
||||
allDigit := true
|
||||
for _, r := range pwd {
|
||||
if r < '0' || r > '9' {
|
||||
allDigit = false
|
||||
break
|
||||
}
|
||||
}
|
||||
if allDigit {
|
||||
return errors.New("密码不能是纯数字")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// legacyRolePermissions 旧的角色 → 权限码映射(已废弃)。
|
||||
// 保留此常量的价值:作为「用户 role_id 为空」时的语义兜底,但此兜底直接查 roles 表
|
||||
// (按 role 字符串匹配 code),不再依赖这段硬编码数组。本常量仅作注释参照,不再被逻辑引用。
|
||||
@@ -124,7 +143,6 @@ func userInfoHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
"realName": u.RealName,
|
||||
"role": u.Role,
|
||||
"roleId": u.RoleID,
|
||||
"dept": u.Dept,
|
||||
"isActive": u.IsActive,
|
||||
"permissionCodes": permissionsForUser(ctx, u),
|
||||
})
|
||||
@@ -139,7 +157,6 @@ func userDTO(u *ent.User) map[string]any {
|
||||
"realName": u.RealName,
|
||||
"role": u.Role,
|
||||
"roleId": u.RoleID,
|
||||
"dept": u.Dept,
|
||||
"phone": u.Phone,
|
||||
"isActive": u.IsActive,
|
||||
"lastLoginAt": u.LastLoginAt,
|
||||
@@ -164,7 +181,7 @@ func listUsersHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
list, err := q.Order(ent.Asc("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())
|
||||
@@ -187,7 +204,6 @@ func createUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
RealName string `json:"realName"`
|
||||
Role string `json:"role"`
|
||||
RoleID int `json:"roleId"`
|
||||
Dept string `json:"dept"`
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误")
|
||||
@@ -197,8 +213,8 @@ func createUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "用户名和密码必填")
|
||||
return
|
||||
}
|
||||
if len(req.Password) < minPasswordLen {
|
||||
fail(w, http.StatusBadRequest, "密码长度至少 6 位")
|
||||
if err := checkPasswordStrong(req.Password); err != nil {
|
||||
fail(w, http.StatusBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
exists, _ := ctx.EntClient.User.Query().Where(user.UsernameEQ(req.Username)).Exist(ctx0())
|
||||
@@ -231,14 +247,13 @@ func createUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
SetNillableRealName(strPtr(req.RealName)).
|
||||
SetRole(role).
|
||||
SetRoleID(roleID).
|
||||
SetNillableDept(strPtr(req.Dept)).
|
||||
Save(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
ctx.EventLog.Write(ctx0(), "user.create", r.Header.Get("X-Username"), "user", strconv.Itoa(u.ID),
|
||||
"新建账号 "+u.Username, map[string]any{"roleId": roleID, "dept": req.Dept})
|
||||
"新建账号 "+u.Username, map[string]any{"roleId": roleID})
|
||||
ok(w, userDTO(u))
|
||||
})
|
||||
}
|
||||
@@ -251,7 +266,6 @@ func updateUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
RealName string `json:"realName"`
|
||||
Role string `json:"role"`
|
||||
RoleID int `json:"roleId"`
|
||||
Dept string `json:"dept"`
|
||||
IsActive *bool `json:"isActive"`
|
||||
Password string `json:"password"`
|
||||
}
|
||||
@@ -278,23 +292,20 @@ func updateUserHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if rl, err := ctx.EntClient.Role.Get(ctx0(), req.RoleID); err == nil {
|
||||
upd.SetRole(rl.Code).SetRoleID(rl.ID)
|
||||
}
|
||||
} else if req.Role != "" {
|
||||
} else if req.Role != "" {
|
||||
role := roleOrDefault(req.Role)
|
||||
upd.SetRole(role)
|
||||
if rl, err := ctx.EntClient.Role.Query().Where(userrole.CodeEQ(role)).Only(ctx0()); err == nil {
|
||||
upd.SetRoleID(rl.ID)
|
||||
}
|
||||
}
|
||||
if req.Dept != "" {
|
||||
upd.SetNillableDept(strPtr(req.Dept))
|
||||
}
|
||||
if req.IsActive != nil {
|
||||
upd.SetIsActive(*req.IsActive)
|
||||
}
|
||||
// 可选重置密码:填写且 >=6 位才生效
|
||||
// 可选重置密码:填写且通过强度校验才生效
|
||||
if req.Password != "" {
|
||||
if len(req.Password) < minPasswordLen {
|
||||
fail(w, http.StatusBadRequest, "密码长度至少 6 位")
|
||||
if err := checkPasswordStrong(req.Password); err != nil {
|
||||
fail(w, http.StatusBadRequest, err.Error())
|
||||
return
|
||||
}
|
||||
hash, e2 := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
|
||||
|
||||
Reference in New Issue
Block a user