- 用户表扩展: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 监控与帮助文档,刷新构建产物 - 更新问题记录文档
143 lines
5.4 KiB
Go
143 lines
5.4 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"errors"
|
||
"fmt"
|
||
"io"
|
||
"net/http"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"bj_power_workstation/internal/mes"
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// tighteningRecordHandler POST /api/tightening/record —— 录入一条拧紧数据。
|
||
// 真实场景:工件走到「需要拧紧枪」的工艺步骤时界面聚焦拧紧输入框,人工操作拧紧枪把采集到的
|
||
// 扭矩值打入输入框回车 → 本接口实时直连 MES /api/internal/torque/report 上报。
|
||
// 2026-11-05 拍板:断网即失败(无本地缓存/离线队列/自动重试),操作失败工人重做即可;
|
||
// 本地仅记操作日志(审计),不再落 torque_results 表。
|
||
// 入参 {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator};
|
||
// result 由前端按该步骤考核标准(扭矩 RANGE)判定后传入,非 NG 一律记 OK。
|
||
func tighteningRecordHandler(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 struct {
|
||
Sn string `json:"sn"`
|
||
WorkOrderNo string `json:"workOrderNo"`
|
||
StepId string `json:"stepId"`
|
||
StepName string `json:"stepName"`
|
||
ScrewNo string `json:"screwNo"`
|
||
Torque float64 `json:"torque"`
|
||
Angle float64 `json:"angle"`
|
||
Result string `json:"result"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少工件 SN,请先上料")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.StepId) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少拧紧工艺步骤")
|
||
return
|
||
}
|
||
if req.Result != "NG" {
|
||
req.Result = "OK"
|
||
}
|
||
// 方案 B(多会话版):操作人取自当前请求 Bearer 对应的登录会话(token 即身份,防冒名)
|
||
ss, _ := ctx.Store.GetStationSessionByToken(bearerOf(r))
|
||
op := req.Operator
|
||
if ss != nil && ss.Name != "" {
|
||
op = ss.Name
|
||
}
|
||
// 拧紧域工位标签载体:DOCK%02d 由业务工位号生成(与接驳台 dock 表编码无关),
|
||
// MES 侧按 stationNo(数字工位号)落库并做应拧/实拧分组统计。
|
||
// 2026-11-09:选择模式(配置<=0)用登录会话工位;2026-11-11 多会话:按请求定位。
|
||
bizStationNo := stationNoOf(ctx, r)
|
||
dockCode := fmt.Sprintf("DOCK%02d", bizStationNo)
|
||
body := map[string]any{
|
||
"workOrderNo": req.WorkOrderNo,
|
||
"sn": req.Sn,
|
||
"dockCode": dockCode,
|
||
"stationNo": strconv.Itoa(bizStationNo),
|
||
"screwNo": req.ScrewNo,
|
||
"stepId": req.StepId,
|
||
"stepName": req.StepName,
|
||
"torque": req.Torque,
|
||
"angle": req.Angle,
|
||
"result": req.Result,
|
||
"operator": op,
|
||
}
|
||
if _, _, err := ctx.Mes.Post("/api/internal/torque/report", body, bearerOf(r)); err != nil {
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_rejected",
|
||
fmt.Sprintf("拧紧录入被MES拒绝 sn=%s 步骤=%s:%s", req.Sn, req.StepName, msg))
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无本地缓存/自动重试,工人重做即可)
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_failed",
|
||
fmt.Sprintf("拧紧录入失败(MES不可达) sn=%s 步骤=%s 扭矩=%.1f", req.Sn, req.StepName, req.Torque))
|
||
logx.Errorf("拧紧录入上报失败(MES不可达): %v", err)
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达,拧紧数据未保存,请检查网络后重新录入")
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record",
|
||
fmt.Sprintf("拧紧录入 sn=%s 步骤=%s 扭矩=%.1f 结果=%s", req.Sn, req.StepName, req.Torque, req.Result))
|
||
ok(w, map[string]any{"result": req.Result})
|
||
}
|
||
}
|
||
|
||
// tighteningLiveHandler GET /api/tightening/live —— 返回 OP 控制器最近推送、尚未确认上报的拧紧结果(前端轮询预填)。
|
||
func tighteningLiveHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
if ctx.Tightening == nil || !ctx.Tightening.Enabled() {
|
||
ok(w, map[string]any{"enabled": false, "list": []any{}})
|
||
return
|
||
}
|
||
ok(w, map[string]any{"enabled": true, "list": ctx.Tightening.Latest()})
|
||
}
|
||
}
|
||
|
||
// tighteningConsumeHandler POST /api/tightening/consume —— 操作工点「完成」后标记某条 OP 缓冲结果为已确认(防重复上报)。
|
||
// 入参 {id}。
|
||
func tighteningConsumeHandler(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 struct {
|
||
ID int64 `json:"id"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if req.ID <= 0 {
|
||
fail(w, http.StatusBadRequest, "缺少缓冲结果 ID")
|
||
return
|
||
}
|
||
if ctx.Tightening != nil {
|
||
ctx.Tightening.Consume(req.ID)
|
||
}
|
||
ok(w, map[string]any{"ok": true})
|
||
}
|
||
} |