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:
@@ -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