- 用户表扩展:MES/WMS user 实体新增字段,新增 active_token 迁移 SQL(2026-11-11) - 会话机制:MES 新增 session_guard,重构 token/auth/jwt/perm 与路由;WMS/工作站同步令牌续签与鉴权 - 看板(board):调整 MES 看板产线/生产/侧栏/仓库组件及样式;WMS 看板展示页同步调整 - 工位终端后端:完善报警流、绑定、PLC 对账、拧紧、proxy、上报、站点告警/操作等 handler,补充 mes client/store - 工位终端前端:登录/主界面/各操作面板调整,新增滚动分页与多语言 yaml 文案,刷新构建产物 - MES 业务:新增流程链 logic,调整待审核/产能支撑/产品工艺/设置页、PLC 监控与帮助文档,刷新构建产物 - 更新问题记录文档
228 lines
8.7 KiB
Go
228 lines
8.7 KiB
Go
package handler
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net/http"
|
|
"strconv"
|
|
|
|
"bj_power_workstation/internal/svc"
|
|
)
|
|
|
|
// ============ 工位终端 → MES 内部 API 代理(巡检/应急/数量不符/退料) ============
|
|
// MES 侧对应接口以 X-API-TOKEN 保护(/api/internal/station/*),本服务用配置 token 转发。
|
|
// 统一:读请求体 → 注入 operator(当前登录人) → POST MES → 原样透传响应体。
|
|
|
|
// inspectionSubmitHandler POST /api/inspection/submit(签到/点检/过程巡检/完工确认/异常)
|
|
// 请求体:{category, stationNo, orderNo, sn, shift, result, items, photo, remark, processCode, stepId, stepName, measuredValue}
|
|
func inspectionSubmitHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
if req["category"] == nil || req["category"] == "" {
|
|
fail(w, http.StatusBadRequest, "记录类型 category 必填")
|
|
return
|
|
}
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/inspection", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// emergencyCallHandler POST /api/emergency/call(应急呼叫:落 MES 预警中心)
|
|
// 请求体:{stationNo, orderNo, remark}
|
|
func emergencyCallHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/emergency", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// qtyReportHandler POST /api/qty-report(工位数量不符上报:应发/实收/差异+原因)
|
|
// 请求体:{stationNo, orderNo, sn, materialCode, materialName, planQty, actualQty, cause}
|
|
func qtyReportHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
if req["materialCode"] == nil || req["materialCode"] == "" {
|
|
fail(w, http.StatusBadRequest, "物料编码必填")
|
|
return
|
|
}
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/qty-report", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// returnMaterialHandler POST /api/return-material(工位退料回库房 → WMS 预建待确认退库单)
|
|
// 请求体:{orderNo, stationNo, sn, materialCode, materialName, spec, qty, unit, reason}
|
|
func returnMaterialHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
if req["materialCode"] == nil || req["materialCode"] == "" {
|
|
fail(w, http.StatusBadRequest, "物料编码必填")
|
|
return
|
|
}
|
|
if q, ok := req["qty"].(float64); !ok || int(q) <= 0 {
|
|
fail(w, http.StatusBadRequest, "退库数量必须大于 0")
|
|
return
|
|
}
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/return-material", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// stationReturnListHandler GET /api/return-list —— 工位终端「我的退料单」列表(PENDING 可取消)。
|
|
func stationReturnListHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
stationNo := stationNoOf(ctx, r)
|
|
resp, _, perr := ctx.Mes.Get("/api/internal/station/return-list?stationNo="+strconv.Itoa(stationNo), nil, bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// stationReturnCancelHandler POST /api/return-cancel {returnNo, reason}
|
|
// 工位取消自己发起的 PENDING 退料单(MES 转发 WMS 校验工位归属后取消;已收货不可取消)。
|
|
func stationReturnCancelHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
if rn, _ := req["returnNo"].(string); rn == "" {
|
|
fail(w, http.StatusBadRequest, "returnNo 必填")
|
|
return
|
|
}
|
|
req["stationNo"] = stationNoOf(ctx, r)
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/return-cancel", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// stationReturnReferenceHandler GET /api/return-reference
|
|
// 工位终端余量参考值(剩余余量=应剩余量−已退余量−已损耗;仅展示不阻断提交)。
|
|
func stationReturnReferenceHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
stationNo := stationNoOf(ctx, r)
|
|
resp, _, perr := ctx.Mes.Get("/api/internal/station/return-reference?stationNo="+strconv.Itoa(stationNo), nil, bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// shiftGetHandler GET /api/shift —— 当前班次状态(退出登录前提示「未下班」用,2026-11-03 下班闭环)。
|
|
func shiftGetHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
stationNo := stationNoOf(ctx, r)
|
|
resp, _, perr := ctx.Mes.Get("/api/internal/station/shift?stationNo="+strconv.Itoa(stationNo), nil, bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// offDutyHandler POST /api/off-duty —— 下班/结束作业(工人自检接驳台剩余物料后提交)。
|
|
// {hasLeftover, items[]}:确认无剩余直接下班;有剩余走退料流程(指定接驳台/实际量/损耗原因)后离场。
|
|
func offDutyHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
var req map[string]any
|
|
if err := json.Unmarshal(payload, &req); err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体解析失败")
|
|
return
|
|
}
|
|
req["stationNo"] = stationNoOf(ctx, r)
|
|
injectOperator(req, r)
|
|
body, _ := json.Marshal(req)
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/off-duty", json.RawMessage(body), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// stationNoOf 业务工位号(2026-11-09 拍板;多会话版 2026-11-11 改按请求定位):
|
|
// 配置固定工位(>0)直接用配置;未配置(<=0,登录页选择)时按请求 Bearer 定位登录会话,
|
|
// 取该会话绑定的实际工位号(登录响应 stationNo 落 SQLite session)。
|
|
// 多会话下同一实例可同时登录多个工位,工位号必须随请求走,不能再用全局会话。
|
|
func stationNoOf(ctx *svc.ServiceContext, r *http.Request) int {
|
|
if ctx.Config.Station.StationNo > 0 {
|
|
return ctx.Config.Station.StationNo
|
|
}
|
|
if ss, err := ctx.Store.GetStationSessionByToken(bearerOf(r)); err == nil && ss != nil {
|
|
return ss.StationNo
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// inspectionUploadHandler POST /api/inspection/upload(巡检拍照 base64 上传,代理 MES 内部接口)
|
|
// 请求体:{filename, data(base64)}
|
|
func inspectionUploadHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
payload, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
fail(w, http.StatusBadRequest, "请求体读取失败")
|
|
return
|
|
}
|
|
resp, _, perr := ctx.Mes.Post("/api/internal/station/inspection-upload", json.RawMessage(payload), bearerOf(r))
|
|
mesJSON(w, resp, perr)
|
|
}
|
|
}
|
|
|
|
// injectOperator 若请求体未带 operator,则补当前登录人(工位终端 JWT 解析)
|
|
func injectOperator(req map[string]any, r *http.Request) {
|
|
if req["operator"] == nil || req["operator"] == "" {
|
|
if u := currentUsername(r); u != "" {
|
|
req["operator"] = u
|
|
}
|
|
}
|
|
}
|