feat: 核心业务实体扩充(混产模板/产品BOM/试制记录)、WMS 库存检验增强与前端通用能力
- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页) - WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报 - AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典 - 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列 - 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等) - 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
This commit is contained in:
@@ -23,7 +23,7 @@ func bindPanelHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
body, _, err := ctx.Mes.Get("/api/internal/workpiece/bind-panel",
|
||||
url.Values{"sn": {sn}, "flowId": {flowId}})
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -53,7 +53,7 @@ func bindRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Post("/api/internal/workpiece/binds", json.RawMessage(payload), bearerOf(r))
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -72,7 +72,7 @@ func bindRemoveHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Post("/api/internal/workpiece/binds/remove", json.RawMessage(payload), bearerOf(r))
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
|
||||
@@ -2,9 +2,12 @@ package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"bj_power_workstation/internal/mes"
|
||||
)
|
||||
|
||||
// parseJSON 解析请求体 JSON,失败返回错误。
|
||||
@@ -48,4 +51,29 @@ func errString(err error) string {
|
||||
return s[:maxLen] + "..."
|
||||
}
|
||||
return s
|
||||
}
|
||||
|
||||
// isMesAuthError 判定 MES 返回的是「登录态失效」而不是网络故障。
|
||||
// MES 内部接口把 401 折叠成 "station auth expired or invalid",客户端 client.go 会包成 ErrAuth;
|
||||
// 历史版本/其它调用路径仍可能只带原始文案,故同时做字符串兜底。
|
||||
func isMesAuthError(err error) bool {
|
||||
if err == nil {
|
||||
return false
|
||||
}
|
||||
if errors.Is(err, mes.ErrAuth) {
|
||||
return true
|
||||
}
|
||||
s := err.Error()
|
||||
return strings.Contains(s, "auth expired") || strings.Contains(s, "station auth") || strings.Contains(s, "401")
|
||||
}
|
||||
|
||||
// failMes 工位终端所有 MES 代理的统一错误出口(2026-11-13 P1 整改):
|
||||
// 401/鉴权失效 → 明确提示重新登录;其余 → 502 网络不可达并保留业务语义文案。
|
||||
// 禁止再把登录过期报成「MES 服务不可达」,否则工人会一直等网络而不会重登录。
|
||||
func failMes(w http.ResponseWriter, err error, bizMsg string) {
|
||||
if isMesAuthError(err) {
|
||||
fail(w, http.StatusUnauthorized, "工位登录已失效,请重新登录后再操作")
|
||||
return
|
||||
}
|
||||
fail(w, http.StatusBadGateway, bizMsg)
|
||||
}
|
||||
@@ -17,7 +17,13 @@ import (
|
||||
// mesJSON 透传 MES 响应体;网络不可达时返回 502 中文提示。
|
||||
func mesJSON(w http.ResponseWriter, body []byte, err error) bool {
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
// 2026-11-13 修复:MES 侧把 401 折叠成 "station auth expired or invalid",
|
||||
// 原实现把鉴权失败一并包装成 502「MES 服务不可达」,误导用户以为网络断了。
|
||||
if strings.Contains(errString(err), "auth expired") || strings.Contains(errString(err), "401") {
|
||||
fail(w, http.StatusUnauthorized, "工位登录已失效,请重新登录后再操作")
|
||||
return false
|
||||
}
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return false
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -29,7 +35,7 @@ func mesJSON(w http.ResponseWriter, body []byte, err error) bool {
|
||||
// linePointsHandler GET /api/line/points(产线点位台账:当前每个点位上的工件)
|
||||
func linePointsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
body, _, err := ctx.Mes.Get("/api/internal/line/points", nil)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/line/points", nil, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -70,7 +76,7 @@ func callPoolHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if v := strings.TrimSpace(r.URL.Query().Get("stationNo")); v != "" {
|
||||
q.Set("stationNo", v)
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/pool", q)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/pool", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -110,7 +116,7 @@ func callListHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
q.Set(k, v)
|
||||
}
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/material-requests", q)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/material-requests", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -125,7 +131,7 @@ func callPlanDetailHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if v := strings.TrimSpace(r.URL.Query().Get("stationNo")); v != "" {
|
||||
q.Set("stationNo", v)
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/plan-detail", q)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/plan-detail", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -138,7 +144,7 @@ func stationDockPalletsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if v := strings.TrimSpace(r.URL.Query().Get("stationNo")); v != "" {
|
||||
q.Set("stationNo", v)
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/dock/station-pallets", q)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/dock/station-pallets", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -176,7 +182,7 @@ func materialDetailHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if v := strings.TrimSpace(r.URL.Query().Get("stationNo")); v != "" {
|
||||
q.Set("stationNo", v)
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/material-detail", q)
|
||||
body, _, err := ctx.Mes.Get("/api/internal/call/material-detail", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
@@ -221,7 +227,7 @@ func callStateHandler(ctx *svc.ServiceContext, mesPath, action string) http.Hand
|
||||
body, _ := json.Marshal(req)
|
||||
resp, _, err := ctx.Mes.Post(mesPath, json.RawMessage(body), bearerOf(r))
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, action+"失败:MES 不可达")
|
||||
failMes(w, err, action+"失败:MES 不可达")
|
||||
return
|
||||
}
|
||||
mesJSON(w, resp, err)
|
||||
@@ -231,7 +237,20 @@ func callStateHandler(ctx *svc.ServiceContext, mesPath, action string) http.Hand
|
||||
// docksHandler GET /api/docks 接驳台列表(代理 MES /api/internal/docks;终端按工位过滤 左L/右R)
|
||||
func docksHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
body, _, err := ctx.Mes.Get("/api/internal/docks", url.Values{})
|
||||
body, _, err := ctx.Mes.Get("/api/internal/docks", url.Values{}, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
|
||||
// reasonDictHandler GET /api/dict/reasons?kind=stop|defect|loss 原因基础字典
|
||||
//(2026-11-14 用户拍板:工位终端停机/不良原因由自由文本改下拉,MES 为唯一真源,终端代理)
|
||||
func reasonDictHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := url.Values{}
|
||||
if v := strings.TrimSpace(r.URL.Query().Get("kind")); v != "" {
|
||||
q.Set("kind", v)
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/dict/reasons", q, bearerOf(r))
|
||||
mesJSON(w, body, err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,13 +21,13 @@ func taskCurrentHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
stationNo := atoi(strings.TrimSpace(r.URL.Query().Get("stationNo")), 0)
|
||||
// 工位号须为正整数(原 0/13 虚拟位已废弃,业务定稿·一.10)
|
||||
if stationNo <= 0 {
|
||||
fail(w, http.StatusBadRequest, "缺少有效的 stationNo 参数")
|
||||
fail(w, http.StatusBadRequest, "当前终端未确定工位,请重新登录并选择工位")
|
||||
return
|
||||
}
|
||||
|
||||
body, _, err := ctx.Mes.Get("/api/internal/station/task", url.Values{"stationNo": {strconv.Itoa(stationNo)}})
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -59,7 +59,7 @@ func workloadHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/station/workload", params)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -73,7 +73,7 @@ func stationsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
body, _, err := ctx.Mes.Get("/stations", nil)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||||
@@ -189,7 +189,7 @@ func forwardFile(w http.ResponseWriter, mesc *mes.Client, cache *pdfcache.Cache,
|
||||
// 2) 回源 MES 下载(内部文件接口按 query 参数 name 读取,支持日期子目录)
|
||||
body, header, err := mesc.Get("/api/internal/files", url.Values{"name": {name}})
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "工艺文件获取失败:"+errString(err))
|
||||
failMes(w, err, "工艺文件获取失败:"+errString(err))
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -133,7 +133,7 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_failed",
|
||||
"报工失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("工序完成上报失败(MES不可达): %v", err)
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达,报工未成功,请检查网络后重试")
|
||||
failMes(w, err, "MES 服务不可达,报工未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
// MES 业务拒绝兜底(理论上已由 BizError 分支处理):缺料/SN冲突等,直接失败,不入队
|
||||
@@ -152,7 +152,7 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// tempStoreHandler POST /api/report/temp-store
|
||||
// {sn, orderNo, stationNo, flowId, operator} → 调 MES /api/internal/station/checkin(半成品入库)。
|
||||
// {sn, orderNo, stationNo, flowId, operator} → 调 MES /api/internal/station/checkin(在制品暂存入库)。
|
||||
// 不可达时直接失败回前端(2026-11-05 拍板:断网即失败,无离线队列)。
|
||||
func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
@@ -206,7 +206,7 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_failed",
|
||||
"暂存退库失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("暂存退库上报失败(MES不可达): %v", err)
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达,暂存未成功,请检查网络后重试")
|
||||
failMes(w, err, "MES 服务不可达,暂存未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
// 兜底:MES 以 HTTP200+code≠0 拒绝却未被 BizError 捕获(理论不可达),按拒绝处理
|
||||
@@ -268,7 +268,7 @@ func scrapHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
ctx.Store.AddEventLog("", op, "scrap_failed",
|
||||
"报废登记失败(MES不可达) sn="+req.Sn)
|
||||
fail(w, http.StatusBadGateway, "MES 不可达,报废未登记,请稍后重试(不要重复提交)")
|
||||
failMes(w, err, "MES 不可达,报废未登记,请稍后重试(不要重复提交)")
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
@@ -290,7 +290,7 @@ func mesConfigHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
q := url.Values{"stationNo": {strconv.Itoa(stationNo)}}
|
||||
b, _, err := ctx.Mes.Get("/api/internal/public-config", q, bearerOf(r))
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 不可达,配置获取失败")
|
||||
failMes(w, err, "MES 不可达,配置获取失败")
|
||||
return
|
||||
}
|
||||
ok(w, json.RawMessage(b))
|
||||
|
||||
@@ -68,6 +68,8 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodPost, Path: "/api/call/sign", Handler: callSignHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/call/cancel", Handler: callCancelHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/call/return", Handler: callReturnHandler(ctx)},
|
||||
// 原因基础字典(2026-11-14 用户拍板:停机/不良原因改下拉,代理 MES 唯一真源)
|
||||
{Method: http.MethodGet, Path: "/api/dict/reasons", Handler: reasonDictHandler(ctx)},
|
||||
// 2026-11-05 叫料包拍板:需求明细(两类提示)/ 左右接驳台实时传感器 / 托盘回库 / 工位物料明细
|
||||
{Method: http.MethodGet, Path: "/api/call/plan-detail", Handler: callPlanDetailHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/dock/station-pallets", Handler: stationDockPalletsHandler(ctx)},
|
||||
|
||||
@@ -95,7 +95,7 @@ func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
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 服务不可达,拧紧数据未保存,请检查网络后重新录入")
|
||||
failMes(w, err, "MES 服务不可达,拧紧数据未保存,请检查网络后重新录入")
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record",
|
||||
|
||||
@@ -35,7 +35,7 @@ func wipHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/workpieces/in-process", params)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
passJSON(w, body)
|
||||
@@ -55,7 +55,7 @@ func bomHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/bom", params)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
passJSON(w, body)
|
||||
@@ -75,7 +75,7 @@ func orderQueryHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/order/query", params)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
passJSON(w, body)
|
||||
@@ -93,7 +93,7 @@ func traceHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
body, _, err := ctx.Mes.Get("/api/internal/workpiece/trace", url.Values{"sn": {sn}})
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||||
failMes(w, err, "MES 服务不可达:"+errString(err))
|
||||
return
|
||||
}
|
||||
passJSON(w, body)
|
||||
@@ -146,7 +146,7 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
|
||||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_failed", "上线建档失败(MES不可达) sn="+req.Sn)
|
||||
logx.Errorf("上线建档失败(MES不可达): %v", err)
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达,建档未成功,请检查网络后重试")
|
||||
failMes(w, err, "MES 服务不可达,建档未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
@@ -207,7 +207,7 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
|
||||
ctx.Store.AddEventLog("", opName, "offline_finish_failed", "下线完工失败(MES不可达) sn="+req.Sn)
|
||||
logx.Errorf("下线完工失败(MES不可达): %v", err)
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达,完工未成功,请检查网络后重试")
|
||||
failMes(w, err, "MES 服务不可达,完工未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
|
||||
Reference in New Issue
Block a user