Files
bj_power/bj_power_workstation/internal/handler/report.go
T
SunYF 5e2640c13a feat: AGV点位锁与缓存迁移 + 工位终端去离线队列 + WMS出入库增强
【MES】
- AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码)
- 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁
- 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖)
- AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善
- 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新
- 新增 migrations/、sql/ 目录

【WMS】
- 出库、Excel 导出、物料、路由处理增强
- 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整

【工位终端】
- 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作
- 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出

【文档】
- 删除 AGV海康litev1.5.md;案例.md 更新
2026-11-07 15:06:00 +08:00

294 lines
11 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"
"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:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
op := req.Operator
if ss, sErr := ctx.Store.GetStationSession(); 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))
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)
fail(w, http.StatusBadGateway, "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:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
op := req.Operator
if ss, sErr := ctx.Store.GetStationSession(); 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))
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)
fail(w, http.StatusBadGateway, "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
}
// 操作人取工位登录态可信身份(防冒名),与暂存退库同口径
op := req.Operator
if ss, sErr := ctx.Store.GetStationSession(); 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))
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)
fail(w, http.StatusBadGateway, "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-03 拍板:拧紧禁止手填时输入框置灰,只能由枪自动采集)。
func mesConfigHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
b, _, err := ctx.Mes.Get("/api/internal/public-config", nil)
if err != nil {
fail(w, http.StatusBadGateway, "MES 不可达,配置获取失败")
return
}
ok(w, json.RawMessage(b))
}
}