Files
bj_power/bj_power_workstation/internal/handler/report.go
T
SunYF 1e92b2a596 feat: 核心业务实体扩充(混产模板/产品BOM/试制记录)、WMS 库存检验增强与前端通用能力
- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页)
- WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报
- AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典
- 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列
- 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等)
- 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
2026-11-15 12:17:39 +08:00

299 lines
12 KiB
Go
Raw Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
package handler
import (
"encoding/json"
"errors"
"fmt"
"net/http"
"net/url"
"strconv"
"bj_power_workstation/internal/mes"
"bj_power_workstation/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
)
// mesRespCode 解析 MES 统一响应 {code,message}。
// MES 业务失败约定为 HTTP 200 + code!=0(httpx.Fail),HTTP 层无法区分,必须显式解析业务码。
// code==0 返回空串;code!=0 返回 message(供调用方直接透传给前端)。
func mesRespCode(respBody []byte) string {
if len(respBody) == 0 {
return ""
}
var mr struct {
Code int `json:"code"`
Message string `json:"message"`
}
if err := json.Unmarshal(respBody, &mr); err != nil {
return ""
}
if mr.Code == 0 {
return ""
}
if mr.Message != "" {
return mr.Message
}
return fmt.Sprintf("MES 拒绝本次操作(业务码 %d)", mr.Code)
}
// processDoneHandler POST /api/report/process-done
// {sn, orderNo, flowId, stationNo, steps:[{stepId,name,value,text}], signs:[{stepId,signRole,signer,remark}], binds:[{materialCode,bindValue}], operator}
// 流程:实时报 MES /api/internal/station/report;
// MES 不可达直接失败回前端(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人确认后重做);
// MES 业务拒绝(HTTP200+code!=0,如装配物料未绑齐/电气件SN重复)直接失败回前端。
// binds 为本次工艺的装机绑定(结构件批次/电气件SN),MES 端落库 + 齐套强校验。
// signs 为 needOperatorSign 步骤的操作工签字(需求B 双签),原样转发 MES 强校验落库。
func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Sn string `json:"sn"`
OrderNo string `json:"orderNo"`
FlowId int `json:"flowId"`
StationNo int `json:"stationNo"`
Steps []struct {
StepId int `json:"stepId"`
Name string `json:"name"`
Value float64 `json:"value"`
Text string `json:"text"`
// Checked:needCheck 步骤的「检测确认」结果,原样转发给 MES 做强校验(勿删,否则服务端拿不到确认)
Checked bool `json:"checked"`
} `json:"steps"`
Binds []struct {
MaterialCode string `json:"materialCode"`
BindValue string `json:"bindValue"`
} `json:"binds"`
// 签字确认(需求B 双签):needOperatorSign 步骤的操作工签字,原样转发 MES 强校验落库
Signs []struct {
StepId int `json:"stepId"`
SignRole string `json:"signRole"`
Signer string `json:"signer"`
Remark string `json:"remark"`
} `json:"signs"`
Operator string `json:"operator"`
// 作业时长采集(P0-3):上料时刻/报工时刻(ISO8601),原样转发 MES 算 durationSec;离线重传时同 payload 保留
StartedAt string `json:"startedAt"`
EndedAt string `json:"endedAt"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.Sn == "" || req.FlowId <= 0 || req.StationNo <= 0 {
fail(w, http.StatusBadRequest, "sn/flowId/stationNo 必填")
return
}
// 方案 B(多会话版):操作人取自当前请求 Bearer 对应的登录会话(token 即身份),
// 忽略浏览器请求体里的 operator(防冒名)
op := req.Operator
if ss, sErr := ctx.Store.GetStationSessionByToken(bearerOf(r)); sErr == nil && ss != nil && ss.Name != "" {
op = ss.Name
}
body := map[string]any{
"sn": req.Sn,
"orderNo": req.OrderNo,
"flowId": req.FlowId,
"stationNo": req.StationNo,
"operator": op,
}
if len(req.Binds) > 0 {
body["binds"] = req.Binds
}
if len(req.Signs) > 0 {
body["signs"] = req.Signs
}
if req.StartedAt != "" {
body["startedAt"] = req.StartedAt
}
if req.EndedAt != "" {
body["endedAt"] = req.EndedAt
}
payloadBytes, _ := json.Marshal(body)
respBody, _, err := ctx.Mes.Post("/api/internal/station/report", json.RawMessage(payloadBytes), bearerOf(r))
if err != nil {
// MES 业务拒绝(HTTP200+code≠0,如装配物料未绑齐/需签字确认/不可倒序报工):
// 数据本身不合法,原样重传不可能成功——直接失败回前端,绝不入离线队。
var bizErr *mes.BizError
if errors.As(err, &bizErr) {
msg := mesRespCode(bizErr.Body)
if msg == "" {
msg = bizErr.Error()
}
// 拒绝痕:记「被拒」而非「完成上报」,避免事件日志误导(成功才记完成痕)
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_rejected",
"报工被MES拒绝 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+":"+msg)
logx.Errorf("工序完成上报被 MES 拒绝(不入队): %s", msg)
fail(w, http.StatusConflict, msg)
return
}
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_failed",
"报工失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo))
logx.Errorf("工序完成上报失败(MES不可达): %v", err)
failMes(w, err, "MES 服务不可达,报工未成功,请检查网络后重试")
return
}
// MES 业务拒绝兜底(理论上已由 BizError 分支处理):缺料/SN冲突等,直接失败,不入队
if msg := mesRespCode(respBody); msg != "" {
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_rejected",
"报工被MES拒绝 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+":"+msg)
logx.Errorf("工序完成上报被 MES 拒绝: %s", msg)
fail(w, http.StatusConflict, msg)
return
}
ctx.Store.AddEventLog(req.OrderNo, op, "process_done",
"工艺完成上报 sn="+req.Sn+" stationNo="+itoa(req.StationNo)+" flowId="+itoa(req.FlowId)+" binds="+itoa(len(req.Binds)))
ok(w, map[string]any{"ok": true})
}
}
// tempStoreHandler POST /api/report/temp-store
// {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) {
var req struct {
Sn string `json:"sn"`
OrderNo string `json:"orderNo"`
StationNo int `json:"stationNo"`
FlowId int `json:"flowId"`
Operator string `json:"operator"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.Sn == "" {
fail(w, http.StatusBadRequest, "缺少 sn")
return
}
// 方案 B(多会话版):操作人取自当前请求 Bearer 对应的登录会话(token 即身份,防冒名)
op := req.Operator
if ss, sErr := ctx.Store.GetStationSessionByToken(bearerOf(r)); sErr == nil && ss != nil && ss.Name != "" {
op = ss.Name
}
body := map[string]any{
"sn": req.Sn,
"orderNo": req.OrderNo,
"stationNo": req.StationNo,
"flowId": req.FlowId,
"operator": op,
}
payloadBytes, _ := json.Marshal(body)
respBody, _, err := ctx.Mes.Post("/api/internal/station/checkin", json.RawMessage(payloadBytes), bearerOf(r))
if err != nil {
// MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队
var bizErr *mes.BizError
if errors.As(err, &bizErr) {
msg := mesRespCode(bizErr.Body)
if msg == "" {
msg = bizErr.Error()
}
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_rejected",
"暂存退库被MES拒绝 sn="+req.Sn+":"+msg)
logx.Errorf("暂存退库被 MES 拒绝(不入队): %s", msg)
fail(w, http.StatusConflict, msg)
return
}
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_failed",
"暂存退库失败(MES不可达) sn="+req.Sn+" stationNo="+itoa(req.StationNo))
logx.Errorf("暂存退库上报失败(MES不可达): %v", err)
failMes(w, err, "MES 服务不可达,暂存未成功,请检查网络后重试")
return
}
// 兜底:MES 以 HTTP200+code≠0 拒绝却未被 BizError 捕获(理论不可达),按拒绝处理
if msg := mesRespCode(respBody); msg != "" {
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_rejected",
"暂存退库被MES拒绝 sn="+req.Sn+":"+msg)
logx.Errorf("暂存退库被 MES 拒绝: %s", msg)
fail(w, http.StatusConflict, msg)
return
}
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store",
"暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
ok(w, map[string]any{"ok": true})
}
}
// scrapHandler POST /api/report/scrap
// {sn, reason, operator} → 调 MES /api/internal/workpiece/scrap(工件报废/人工取走,2026-11-03 补全)。
// 与「暂存退库」语义互斥:报废=永久退出产线(SCRAPPED),退库=合法暂停(SEMI_STORED)可重上线。
// 故意不做离线排队:报废是一次性状态变更,MES 端按当前状态强校验(已报废再报会被拒),
// 离线重发必然失败徒增噪声——MES 不可达时直接提示现场重试。
func scrapHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req struct {
Sn string `json:"sn"`
Reason string `json:"reason"`
Operator string `json:"operator"`
}
if err := parseJSON(r, &req); err != nil {
fail(w, http.StatusBadRequest, "参数错误")
return
}
if req.Sn == "" {
fail(w, http.StatusBadRequest, "缺少 sn")
return
}
if req.Reason == "" {
fail(w, http.StatusBadRequest, "报废/取走原因必填")
return
}
// 操作人取当前请求 Bearer 对应登录会话的可信身份(防冒名),与暂存退库同口径
op := req.Operator
if ss, sErr := ctx.Store.GetStationSessionByToken(bearerOf(r)); sErr == nil && ss != nil && ss.Name != "" {
op = ss.Name
}
body := map[string]any{"sn": req.Sn, "reason": req.Reason}
payloadBytes, _ := json.Marshal(body)
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/scrap?operator="+url.QueryEscape(op), json.RawMessage(payloadBytes), bearerOf(r))
if err != nil {
var bizErr *mes.BizError
if errors.As(err, &bizErr) {
msg := mesRespCode(bizErr.Body)
if msg == "" {
msg = bizErr.Error()
}
fail(w, http.StatusConflict, msg)
return
}
ctx.Store.AddEventLog("", op, "scrap_failed",
"报废登记失败(MES不可达) sn="+req.Sn)
failMes(w, err, "MES 不可达,报废未登记,请稍后重试(不要重复提交)")
return
}
if msg := mesRespCode(respBody); msg != "" {
fail(w, http.StatusConflict, msg)
return
}
ctx.Store.AddEventLog("", op, "workpiece_scrap",
"工件报废/人工取走 sn="+req.Sn+" 原因="+req.Reason)
ok(w, map[string]any{"ok": true})
}
}
// mesConfigHandler GET /api/mes-config 代理 MES 公开配置快照(本工位允许手填 / 缓存策略 / AGV 超时等)。
// 2026-11-09 改:带本机工位号拉 MES「拧紧枪配置」页里该工位的允许手填开关,不再用全局 torque.manual.input。
// 工位号来源:登录会话优先(登录页可选工位),否则取 yaml 固定工位号。
func mesConfigHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
stationNo := stationNoOf(ctx, r)
q := url.Values{"stationNo": {strconv.Itoa(stationNo)}}
b, _, err := ctx.Mes.Get("/api/internal/public-config", q, bearerOf(r))
if err != nil {
failMes(w, err, "MES 不可达,配置获取失败")
return
}
ok(w, json.RawMessage(b))
}
}