Files
SunYF af554cea75 feat: 同步失败台账双向可重试 + 拧紧枪按工位配置 + 虚拟工位体系 + 去Redis与文档口径对齐
- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。
- 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。
- 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。
- AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。
- 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。
- 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。
- 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
2026-11-09 18:58:47 +08:00

98 lines
3.9 KiB
Go
Raw Permalink 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 (
"net/http"
"strconv"
"strings"
"bj_power_wms/internal/svc"
"bj_power_wms/internal/syncfailure"
)
// syncFailureListHandler GET /api/sync-failures 同步失败台账列表(人工可见,不自动重试)
func syncFailureListHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
rows, err := syncfailure.List(ctx.SQLDB, r.URL.Query().Get("status"), r.URL.Query().Get("bizType"))
if err != nil {
fail(w, http.StatusInternalServerError, "查询同步失败台账失败(部署时请先手工执行迁移 SQL 建表): "+err.Error())
return
}
ok(w, rows)
}
}
// syncFailureRetryHandler POST /api/sync-failures/retry?id=
// 只按台账 endpoint + payload_json 原样重放通知,绝不重跑 doGeneralOutbound 等本地业务。
// 重试前先查对端终态;已终态直接置 SUCCESS,不重复通知。
func syncFailureRetryHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
id, err := strconv.ParseInt(strings.TrimSpace(r.URL.Query().Get("id")), 10, 64)
if err != nil || id <= 0 {
fail(w, http.StatusBadRequest, "缺少有效的 id")
return
}
row, err := syncfailure.Get(ctx.SQLDB, id)
if err != nil {
fail(w, http.StatusNotFound, "台账记录不存在: "+err.Error())
return
}
if row.Status == "SUCCESS" {
ok(w, map[string]any{"id": id, "status": "SUCCESS", "note": "已成功,无需重试"})
return
}
if ctx.Mes == nil {
fail(w, http.StatusInternalServerError, "MES 未配置,无法重放通知")
return
}
payload := syncfailure.Payload(row)
// 叫料完成备料:先查 MES 叫料单终态,避免通知已成功但响应丢失时重复回写
if row.BizType == "call.complete" {
if requestNo, isStr := payload["requestNo"].(string); isStr && requestNo != "" {
status, serr := ctx.Mes.CallStatus(r.Context(), requestNo)
if serr == nil && status != "" && status != "PENDING" {
_ = syncfailure.MarkSuccess(ctx.SQLDB, id)
ok(w, map[string]any{"id": id, "status": "SUCCESS", "note": "对端已终态(" + status + "),无需重放"})
return
}
}
}
if err := ctx.Mes.PostRaw(r.Context(), row.Endpoint, payload); err != nil {
_ = syncfailure.MarkRetryFailed(ctx.SQLDB, id, err.Error())
// 对端非 PENDING 属「通知其实已成功」,按幂等成功收口
if strings.Contains(err.Error(), "仅待备料的叫料单可完成备料") {
_ = syncfailure.MarkSuccess(ctx.SQLDB, id)
ok(w, map[string]any{"id": id, "status": "SUCCESS", "note": "对端已终态,无需重放"})
return
}
fail(w, http.StatusBadGateway, "重试失败(已计入 retry_count): "+err.Error())
return
}
_ = syncfailure.MarkSuccess(ctx.SQLDB, id)
ctx.EventLog.Write(ctx0(), "sync.failure.retry", "warehouse", "sync_failure", strconv.FormatInt(id, 10),
"同步失败台账人工重试成功:"+row.BizType+" / "+row.BizKey, nil)
ok(w, map[string]any{"id": id, "status": "SUCCESS"})
}
}
// syncFailureIgnoreHandler POST /api/sync-failures/ignore?id= 线下已处理 → DEAD 留痕
func syncFailureIgnoreHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
id, err := strconv.ParseInt(strings.TrimSpace(r.URL.Query().Get("id")), 10, 64)
if err != nil || id <= 0 {
fail(w, http.StatusBadRequest, "缺少有效的 id")
return
}
operator := r.Header.Get("X-Username")
if operator == "" {
operator = "warehouse"
}
if err := syncfailure.Ignore(ctx.SQLDB, id, operator); err != nil {
fail(w, http.StatusInternalServerError, "标记已处理失败: "+err.Error())
return
}
ctx.EventLog.Write(ctx0(), "sync.failure.ignore", operator, "sync_failure", strconv.FormatInt(id, 10),
"同步失败台账人工标记已处理", nil)
ok(w, map[string]any{"id": id, "status": "DEAD"})
}
}