本提交完成了多个核心模块的功能完善与业务对齐: 1. 工位终端:固定工位配置、移除自选工位逻辑、适配配置化工位号 2. MES核心:重构工位组合逻辑、新增工单/流程状态管理、补全报工/追溯逻辑 3. WMS客户端:新增修改密码功能、优化帮助弹窗逻辑 4. 文档与权限:补充完整操作手册、统一菜单名称与权限描述 5. 修复多业务校验:排产数量校验、工单状态校验、工位绑定规则
68 lines
2.1 KiB
Go
68 lines
2.1 KiB
Go
package handler
|
||
|
||
import (
|
||
"net/http"
|
||
"strings"
|
||
"time"
|
||
|
||
"bj_power_workstation/internal/svc"
|
||
)
|
||
|
||
func healthHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
if err := ctx.Store.Ping(); err == nil {
|
||
ok(w, map[string]any{
|
||
"status": "UP",
|
||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||
"service": "bj_power_workstation",
|
||
})
|
||
return
|
||
}
|
||
fail(w, http.StatusServiceUnavailable, "本地数据库不可用")
|
||
}
|
||
}
|
||
|
||
// loginHandler 登录代理 MES /api/internal/station/login(块1:用户体系来源于 MES)。
|
||
// 前端提交 {username, password, stationNo},MES 校验工位终端密码 + 工位权限并签发同密钥 JWT。
|
||
// 响应体原样透传({code,message,data:{accessToken,expireAt,user,stations,stationNo}})。
|
||
func loginHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req struct {
|
||
Username string `json:"username"`
|
||
Password string `json:"password"`
|
||
StationNo int `json:"stationNo"`
|
||
}
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "参数错误")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.Username) == "" || req.Password == "" {
|
||
fail(w, http.StatusBadRequest, "用户名和密码必填")
|
||
return
|
||
}
|
||
|
||
body, _, err := ctx.Mes.Post("/api/internal/station/login", map[string]any{
|
||
"username": strings.TrimSpace(req.Username),
|
||
"password": req.Password,
|
||
"stationNo": req.StationNo,
|
||
})
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||
w.WriteHeader(http.StatusOK)
|
||
_, _ = w.Write(body)
|
||
}
|
||
}
|
||
|
||
// configHandler GET /api/config 返回工位配置:
|
||
// 固定工位号 stationNo(1~12,由 yaml 配置在启动时加载,终端不可修改)、本工位需拧紧的螺丝颗数。
|
||
func configHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
ok(w, map[string]any{
|
||
"stationNo": ctx.Config.Station.StationNo,
|
||
"screwCount": ctx.Config.Station.ScrewCount,
|
||
})
|
||
}
|
||
} |