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 更新
This commit is contained in:
@@ -103,14 +103,6 @@ func logoutHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
StationNo int `json:"stationNo"`
|
||||
}
|
||||
_ = parseJSON(r, &req)
|
||||
// 退出前先统计「当前登录人」尚未成功上报的本地数据条数,供前端提醒本人处理
|
||||
pendingQueue, pendingTorque := int64(0), int64(0)
|
||||
deadQueue := int64(0)
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||||
pendingQueue, _ = ctx.Store.PendingQueueCountForOperator(ss.UserID)
|
||||
pendingTorque, _ = ctx.Store.PendingTorqueCountForOperator(ss.UserID)
|
||||
deadQueue, _ = ctx.Store.DeadQueueCountForOperator(ss.UserID)
|
||||
}
|
||||
username := strings.TrimSpace(req.Username)
|
||||
if username != "" {
|
||||
no := req.StationNo
|
||||
@@ -124,12 +116,7 @@ func logoutHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
// 方案 B:退出即清除本地登录态与 Bearer 凭证
|
||||
_ = ctx.Store.ClearStationSession()
|
||||
ctx.Mes.SetStationToken("")
|
||||
ok(w, map[string]any{
|
||||
"pendingQueue": pendingQueue,
|
||||
"pendingTorque": pendingTorque,
|
||||
"pendingTotal": pendingQueue + pendingTorque,
|
||||
"deadTotal": deadQueue,
|
||||
})
|
||||
ok(w, map[string]any{"ok": true})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,11 +38,11 @@ func mesRespCode(respBody []byte) string {
|
||||
|
||||
// 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 不可达则写入 report_queue(kind=process_done) 并返回 data.queued=true(离线缓存稍后自动重传);
|
||||
// MES 业务拒绝(HTTP200+code!=0,如装配物料未绑齐/电气件SN重复)直接失败回前端,绝不入离线队。
|
||||
// binds 为本次工艺的装机绑定(结构件批次/电气件SN),MES 端落库 + 齐套强校验;离线重传时原样携带。
|
||||
// signs 为 needOperatorSign 步骤的操作工签字(需求B 双签),原样转发 MES 强校验落库;离线重传时随 payload 保留。
|
||||
// 流程:实时报 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 {
|
||||
@@ -83,20 +83,12 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名);
|
||||
// operator_id 用于离线队列按操作人隔离发送(仅当前登录人自己的数据被发送)
|
||||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
|
||||
op := req.Operator
|
||||
opID := int64(0)
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||||
if ss.Name != "" {
|
||||
op = ss.Name
|
||||
}
|
||||
opID = ss.UserID
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
op = ss.Name
|
||||
}
|
||||
|
||||
// 先尽力冲刷历史积压,失败不影响本次上报
|
||||
ctx.Syncer.RunOnce(r.Context())
|
||||
|
||||
body := map[string]any{
|
||||
"sn": req.Sn,
|
||||
"orderNo": req.OrderNo,
|
||||
@@ -135,14 +127,11 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("process_done", string(payloadBytes), opID, op); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "process_done_queued",
|
||||
"报工离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("工序完成上报失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
// 网络失败:直接报错(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冲突等,直接失败,不入队
|
||||
@@ -156,13 +145,13 @@ func processDoneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
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{"queued": false})
|
||||
ok(w, map[string]any{"ok": true})
|
||||
}
|
||||
}
|
||||
|
||||
// tempStoreHandler POST /api/report/temp-store
|
||||
// {sn, orderNo, stationNo, flowId, operator} → 调 MES /api/internal/station/checkin(半成品入库)。
|
||||
// 不可达时以同样 payload 写入 report_queue(kind=temp_store)。
|
||||
// 不可达时直接失败回前端(2026-11-05 拍板:断网即失败,无离线队列)。
|
||||
func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
@@ -181,20 +170,12 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
|
||||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名);
|
||||
// operator_id 用于离线队列按操作人隔离发送(仅当前登录人自己的数据被发送)
|
||||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
|
||||
op := req.Operator
|
||||
opID := int64(0)
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||||
if ss.Name != "" {
|
||||
op = ss.Name
|
||||
}
|
||||
opID = ss.UserID
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
op = ss.Name
|
||||
}
|
||||
|
||||
// 先尽力冲刷历史积压,失败不影响本次上报
|
||||
ctx.Syncer.RunOnce(r.Context())
|
||||
|
||||
body := map[string]any{
|
||||
"sn": req.Sn,
|
||||
"orderNo": req.OrderNo,
|
||||
@@ -219,14 +200,11 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("temp_store", string(payloadBytes), opID, op); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store_queued",
|
||||
"暂存退库离线排队 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
logx.Errorf("暂存退库上报失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
// 网络失败:直接报错(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 捕获(理论不可达),按拒绝处理
|
||||
@@ -240,7 +218,7 @@ func tempStoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
ctx.Store.AddEventLog(req.OrderNo, op, "temp_store",
|
||||
"暂存/退回库房 sn="+req.Sn+" stationNo="+itoa(req.StationNo))
|
||||
|
||||
ok(w, map[string]any{"queued": false})
|
||||
ok(w, map[string]any{"ok": true})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -46,7 +46,6 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/station/state", Handler: stationStateHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/pdf", Handler: pdfQueryHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/pdfopen/:name", Handler: pdfOpenHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/tightening/list", Handler: tighteningListHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/tightening/record", Handler: tighteningRecordHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/tightening/live", Handler: tighteningLiveHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/tightening/consume", Handler: tighteningConsumeHandler(ctx)},
|
||||
@@ -55,9 +54,6 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
// 工件报废/人工取走(2026-11-03 补全):与暂存退库语义互斥,原因必填,不做离线排队
|
||||
{Method: http.MethodPost, Path: "/api/report/scrap", Handler: scrapHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/station/logout", Handler: logoutHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/sync/flush", Handler: syncFlushHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/sync/stats", Handler: syncStatsHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/sync/retry-queue", Handler: syncRetryQueueHandler(ctx)},
|
||||
|
||||
// 产线点位 / 叫料(代理 MES 内部 API)
|
||||
{Method: http.MethodGet, Path: "/api/line/points", Handler: linePointsHandler(ctx)},
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
|
||||
"bj_power_workstation/internal/svc"
|
||||
)
|
||||
|
||||
// syncFlushHandler POST /api/sync/flush 手动立即执行一轮同步,返回本次成功条数。
|
||||
func syncFlushHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
count := ctx.Syncer.RunOnce(r.Context())
|
||||
ok(w, map[string]any{
|
||||
"count": count,
|
||||
"message": "本轮同步完成",
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// syncStatsHandler GET /api/sync/stats 返回「当前登录人」尚未成功上报的本地数据(失败列表),
|
||||
// 供前端在「同一人重新登录」时仅展示失败信息(不自动打开页面)。他人数据不被返回、不可见。
|
||||
// queueDead=死信(MES 业务拒绝、待人工重传处理),与 queue(待自动重传)分开回报。
|
||||
func syncStatsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ss, err := ctx.Store.GetStationSession(); err != nil || ss == nil {
|
||||
ok(w, map[string]any{"pendingTorque": 0, "pendingQueue": 0, "pendingTotal": 0,
|
||||
"deadTotal": 0, "queue": []any{}, "queueDead": []any{}, "torque": []any{}})
|
||||
return
|
||||
} else {
|
||||
queue, _ := ctx.Store.PendingQueueItemsForOperator(ss.UserID, 200)
|
||||
queueDead, _ := ctx.Store.DeadQueueItemsForOperator(ss.UserID, 200)
|
||||
torque, _ := ctx.Store.PendingTorqueResultsForOperator(ss.UserID, 200)
|
||||
ok(w, map[string]any{
|
||||
"pendingQueue": len(queue),
|
||||
"pendingTorque": len(torque),
|
||||
"pendingTotal": len(queue) + len(torque),
|
||||
"queue": queue,
|
||||
"queueDead": queueDead,
|
||||
"deadTotal": len(queueDead),
|
||||
"torque": torque,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// syncRetryQueueHandler POST /api/sync/retry-queue 人工重传处理:
|
||||
// 操作工查看失败原因、重选空闲点位后再次提交。body {id, payload},payload 为修正后的完整 JSON body。
|
||||
// 处理:校验归属当前登录人(数据按操作人隔离)→ 写入修正 payload 并重置为待重传 → 立即按当前登录人身份发一轮 →
|
||||
// 回报本轮结果(synced=已发送 / rejected=再次被拒(含原因) / retrying=网络失败,下轮继续)。
|
||||
func syncRetryQueueHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
ss, err := ctx.Store.GetStationSession()
|
||||
if err != nil || ss == nil || ss.Token == "" {
|
||||
fail(w, http.StatusUnauthorized, "登录已失效,请重新登录后再重传")
|
||||
return
|
||||
}
|
||||
var req struct {
|
||||
ID int64 `json:"id"`
|
||||
Payload json.RawMessage `json:"payload"`
|
||||
}
|
||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil || req.ID <= 0 {
|
||||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if len(req.Payload) == 0 {
|
||||
fail(w, http.StatusBadRequest, "缺少上报内容(payload)")
|
||||
return
|
||||
}
|
||||
// 归属校验:只能重传自己的数据(他人数据不被代发、也不可见)
|
||||
item, err := ctx.Store.QueueItemByID(req.ID)
|
||||
if err != nil {
|
||||
fail(w, http.StatusNotFound, "记录不存在或已处理")
|
||||
return
|
||||
}
|
||||
if item.OperatorID != ss.UserID {
|
||||
fail(w, http.StatusForbidden, "只能重传本人录入的数据")
|
||||
return
|
||||
}
|
||||
// 写入修正 payload,重置为待重传(同步器按当前登录人身份发送)
|
||||
if err := ctx.Store.ResetQueueForRetry(req.ID, string(req.Payload)); err != nil {
|
||||
fail(w, http.StatusInternalServerError, "重置重传状态失败")
|
||||
return
|
||||
}
|
||||
ctx.Syncer.RunOnce(r.Context())
|
||||
// 回报本轮结果
|
||||
after, err := ctx.Store.QueueItemByID(req.ID)
|
||||
if err != nil {
|
||||
ok(w, map[string]any{"status": "retrying", "message": "已提交重传,结果下轮同步后可见"})
|
||||
return
|
||||
}
|
||||
switch {
|
||||
case after.Synced == 1:
|
||||
ok(w, map[string]any{"status": "synced", "message": "重传成功,已上报 MES"})
|
||||
case after.Synced == 2:
|
||||
ok(w, map[string]any{"status": "rejected", "message": after.LastError, "reason": after.LastError})
|
||||
default:
|
||||
ok(w, map[string]any{"status": "retrying", "message": "MES 暂不可达,已留在队列等待下轮自动重传"})
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,48 +2,24 @@ package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"bj_power_workstation/internal/store"
|
||||
"bj_power_workstation/internal/mes"
|
||||
"bj_power_workstation/internal/svc"
|
||||
|
||||
"github.com/zeromicro/go-zero/core/logx"
|
||||
)
|
||||
|
||||
// tighteningListHandler GET /api/tightening/list?sn=&only_pending=true&limit=100
|
||||
// 查询本地 torque_results(最新优先)。
|
||||
func tighteningListHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
sn := q.Get("sn")
|
||||
|
||||
onlyPending := false
|
||||
if v, err := strconv.ParseBool(q.Get("only_pending")); err == nil {
|
||||
onlyPending = v
|
||||
}
|
||||
|
||||
limit := atoi(q.Get("limit"), 100)
|
||||
if limit <= 0 || limit > 500 {
|
||||
limit = 500
|
||||
}
|
||||
|
||||
list, err := ctx.Store.ListTorqueResults(sn, onlyPending, limit)
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "查询拧紧结果失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, map[string]any{
|
||||
"total": len(list),
|
||||
"list": list,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// tighteningRecordHandler POST /api/tightening/record —— 录入一条拧紧数据。
|
||||
// 真实场景:工件走到「需要拧紧枪」的工艺步骤时界面聚焦拧紧输入框,人工操作拧紧枪把采集到的
|
||||
// 扭矩值打入输入框回车 → 本接口按当前工件 SN + 工艺步骤落本地库,再由后台同步器上报 MES。
|
||||
// 扭矩值打入输入框回车 → 本接口实时直连 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 {
|
||||
@@ -85,33 +61,44 @@ func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if ss != nil && ss.Name != "" {
|
||||
op = ss.Name
|
||||
}
|
||||
opID := int64(0)
|
||||
if ss != nil {
|
||||
opID = ss.UserID
|
||||
}
|
||||
// 拧紧域工位标签载体(自洽闭环):写入 DOCK%02d、syncer 上报前同公式反推工位号——
|
||||
// 与接驳台 dock 表编码无关,接驳台左右互换(side 字段)不影响本数据流。
|
||||
// 拧紧域工位标签载体:DOCK%02d 由本机固定工位号生成(与接驳台 dock 表编码无关),
|
||||
// MES 侧按 stationNo(数字工位号)落库并做应拧/实拧分组统计。
|
||||
dockCode := fmt.Sprintf("DOCK%02d", ctx.Config.Station.StationNo)
|
||||
id, err := ctx.Store.InsertTorqueResult(store.TorqueResult{
|
||||
WorkOrderNo: req.WorkOrderNo,
|
||||
Sn: req.Sn,
|
||||
DockCode: dockCode,
|
||||
ScrewNo: req.ScrewNo,
|
||||
StepId: req.StepId,
|
||||
StepName: req.StepName,
|
||||
Torque: req.Torque,
|
||||
Angle: req.Angle,
|
||||
Result: req.Result,
|
||||
Operator: op,
|
||||
OperatorID: opID,
|
||||
})
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "拧紧数据入库失败:"+err.Error())
|
||||
body := map[string]any{
|
||||
"workOrderNo": req.WorkOrderNo,
|
||||
"sn": req.Sn,
|
||||
"dockCode": dockCode,
|
||||
"stationNo": strconv.Itoa(ctx.Config.Station.StationNo),
|
||||
"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); 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{"id": id, "result": req.Result})
|
||||
ok(w, map[string]any{"result": req.Result})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -116,15 +116,10 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||||
return
|
||||
}
|
||||
ctx.Syncer.RunOnce(r.Context())
|
||||
// 录入时操作人(当前登录人),供离线队列按操作人隔离发送
|
||||
opID := int64(0)
|
||||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||||
opName := req.Operator
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||||
opID = ss.UserID
|
||||
if ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
q := url.Values{}
|
||||
if req.Operator != "" {
|
||||
@@ -132,7 +127,7 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload))
|
||||
if err != nil {
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||||
var bizErr *mes.BizError
|
||||
if errors.As(err, &bizErr) {
|
||||
msg := mesRespCode(bizErr.Body)
|
||||
@@ -141,17 +136,14 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected",
|
||||
"上线建档被MES拒绝 sn="+req.Sn+":"+msg)
|
||||
logx.Errorf("上线建档被 MES 拒绝(不入队): %s", msg)
|
||||
logx.Errorf("上线建档被 MES 拒绝: %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("online_register", string(payload), opID, opName); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_queued", "上线建档离线排队 sn="+req.Sn)
|
||||
logx.Errorf("上线建档失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
// 网络失败:直接报错(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 服务不可达,建档未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
@@ -162,7 +154,7 @@ func onlineHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register", "上线建档 sn="+req.Sn)
|
||||
// 透传 MES 响应(data 即 PLC↔MES 对账 mismatch 对象,无对账时为 null),
|
||||
// 供前端建档成功后按需弹「两项」提示;离线队列分支仍返回 {queued:true}。
|
||||
// 供前端建档成功后按需弹「两项」提示。
|
||||
passJSON(w, respBody)
|
||||
}
|
||||
}
|
||||
@@ -186,15 +178,10 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||||
return
|
||||
}
|
||||
ctx.Syncer.RunOnce(r.Context())
|
||||
// 录入时操作人(当前登录人),供离线队列按操作人隔离发送
|
||||
opID := int64(0)
|
||||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||||
opName := req.Operator
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil {
|
||||
opID = ss.UserID
|
||||
if ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||||
opName = ss.Name
|
||||
}
|
||||
q := url.Values{}
|
||||
if req.Operator != "" {
|
||||
@@ -202,7 +189,7 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload))
|
||||
if err != nil {
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法重传不可能成功,直接失败回前端不入队
|
||||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||||
var bizErr *mes.BizError
|
||||
if errors.As(err, &bizErr) {
|
||||
msg := mesRespCode(bizErr.Body)
|
||||
@@ -210,17 +197,14 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
msg = bizErr.Error()
|
||||
}
|
||||
ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg)
|
||||
logx.Errorf("下线完工被 MES 拒绝(不入队): %s", msg)
|
||||
logx.Errorf("下线完工被 MES 拒绝: %s", msg)
|
||||
fail(w, http.StatusConflict, msg)
|
||||
return
|
||||
}
|
||||
if qerr := ctx.Store.InsertQueueItem("offline_finish", string(payload), opID, opName); qerr != nil {
|
||||
fail(w, http.StatusInternalServerError, "上报失败且离线队列写入失败:"+qerr.Error())
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog("", opName, "offline_finish_queued", "下线完工离线排队 sn="+req.Sn)
|
||||
logx.Errorf("下线完工上报失败已离线排队: %v", err)
|
||||
ok(w, map[string]any{"queued": true})
|
||||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
|
||||
ctx.Store.AddEventLog("", opName, "offline_finish_failed", "下线完工失败(MES不可达) sn="+req.Sn)
|
||||
logx.Errorf("下线完工失败(MES不可达): %v", err)
|
||||
fail(w, http.StatusBadGateway, "MES 服务不可达,完工未成功,请检查网络后重试")
|
||||
return
|
||||
}
|
||||
if msg := mesRespCode(respBody); msg != "" {
|
||||
@@ -229,6 +213,6 @@ func doneHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return
|
||||
}
|
||||
ctx.Store.AddEventLog("", opName, "offline_finish", "下线完工入库 sn="+req.Sn)
|
||||
ok(w, map[string]any{"queued": false})
|
||||
ok(w, map[string]any{"ok": true})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user