feat: 同步失败台账双向可重试 + 拧紧枪按工位配置 + 虚拟工位体系 + 去Redis与文档口径对齐
- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。 - 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。 - 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。 - AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。 - 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。 - 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。 - 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
This commit is contained in:
@@ -46,6 +46,9 @@ var pathPermMap = map[string]string{
|
||||
"POST:/api/v1/product-processes/copy": "produce.productprocess:edit",
|
||||
// 基础设置(WMS 地址/需求窗口/外推参数/日志保留)
|
||||
"PUT:/api/v1/settings": "sys.settings:edit",
|
||||
// 同步失败台账(2026-11-08):人工重试/标记已处理
|
||||
"POST:/api/v1/sync-failures/retry": "sys.syncfailure:retry",
|
||||
"POST:/api/v1/sync-failures/ignore": "sys.syncfailure:retry",
|
||||
// 过程巡检汇总生成《工序间检验记录》(巡检终端操作域)
|
||||
"POST:/api/v1/inspections/generate-inter-process": "sys.inspect:process",
|
||||
// 质量检验处置(过程检/完工检不合格处置 退货/返修/退换):按记录类型在 handler 内做权限粒度校验
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
// - 伪造请求体 operator:仍以 JWT 真实姓名落痕,且冒名探测器写 security.impersonation
|
||||
// - 无/过期 Bearer:401,不进入业务
|
||||
//
|
||||
// 仅连 PostgreSQL(dev 库),不依赖 Redis/PLC,测试后清理自身写入的审计行。
|
||||
// 仅连 PostgreSQL(dev 库),不依赖 PLC 或外部缓存,测试后清理自身写入的审计行。
|
||||
func TestStationSecurityVerify(t *testing.T) {
|
||||
secret := "Hardman_2026"
|
||||
c := config.Config{
|
||||
|
||||
@@ -21,6 +21,10 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPost, Path: "/api/internal/torque/report", Handler: internal(production.StationSessionAuth(serverCtx)(production.TorqueReportInternalHandler(serverCtx))),
|
||||
})
|
||||
// 拧紧枪配置快照上报(终端启动 best-effort):只写 MES 侧展示记录,不参与拧紧数据收集
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPost, Path: "/api/internal/torque/config/report", Handler: internal(TorqueGunConfigReportHandler(serverCtx)),
|
||||
})
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPost, Path: "/api/internal/workpiece/report", Handler: internal(production.StationSessionAuth(serverCtx)(production.WorkpieceReportInternalHandler(serverCtx))),
|
||||
})
|
||||
@@ -38,6 +42,10 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPost, Path: "/api/internal/materials", Handler: internal(production.UpsertMaterialInternalHandler(serverCtx)),
|
||||
})
|
||||
// 同步失败台账重试前判对端终态:WMS 按 requestNo 查叫料单状态,已终态不再重放通知
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodGet, Path: "/api/internal/call/status", Handler: internal(CallStatusInternalHandler(serverCtx)),
|
||||
})
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPut, Path: "/api/internal/materials", Handler: internal(production.UpsertMaterialInternalHandler(serverCtx)),
|
||||
})
|
||||
@@ -55,6 +63,9 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
}, rest.WithTimeout(3600_000_000_000))
|
||||
|
||||
// ---------- 工位终端内部 API(块1/4/5/6) ----------
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodGet, Path: "/api/internal/station/options", Handler: internal(StationOptionsInternalHandler(serverCtx)),
|
||||
})
|
||||
server.AddRoute(rest.Route{
|
||||
Method: http.MethodPost, Path: "/api/internal/station/login", Handler: internal(StationLoginInternalHandler(serverCtx)),
|
||||
})
|
||||
@@ -536,6 +547,10 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
{Method: http.MethodPut, Path: "/settings", Handler: SaveSettingsHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/settings/wms-test", Handler: WmsTestHandler(serverCtx)},
|
||||
|
||||
// ---------- 拧紧枪配置(仅展示记录;三把枪通道号不参与数据收集/校验/拦截) ----------
|
||||
{Method: http.MethodGet, Path: "/torque-gun-config", Handler: TorqueGunConfigHandler(serverCtx)},
|
||||
{Method: http.MethodPut, Path: "/torque-gun-config", Handler: SaveTorqueGunConfigHandler(serverCtx)},
|
||||
|
||||
// ---------- 应急呼叫(D3,MES 前端亦可发起) ----------
|
||||
{Method: http.MethodPost, Path: "/alert/emergency", Handler: EmergencyCallHandler(serverCtx)},
|
||||
|
||||
@@ -556,6 +571,11 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
|
||||
// ---------- 排产支撑视图(§A2 / §D1):可生产套数 + 支撑天数 + 最先告罄短板物料 ----------
|
||||
{Method: http.MethodGet, Path: "/production/producible-support", Handler: production.ProducibleSupportHandler(serverCtx)},
|
||||
|
||||
// ---------- 同步失败台账(2026-11-08):人工可见 + 手动重试/标记已处理,不自动重传 ----------
|
||||
{Method: http.MethodGet, Path: "/sync-failures", Handler: SyncFailureListHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/sync-failures/retry", Handler: SyncFailureRetryHandler(serverCtx)},
|
||||
{Method: http.MethodPost, Path: "/sync-failures/ignore", Handler: SyncFailureIgnoreHandler(serverCtx)},
|
||||
}
|
||||
server.AddRoutes(
|
||||
rest.WithMiddlewares([]rest.Middleware{permissionGuard(serverCtx)}, jwtRoutes...),
|
||||
|
||||
@@ -3,6 +3,7 @@ package handler
|
||||
import (
|
||||
"context"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
@@ -52,18 +53,22 @@ func WmsTestHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
}
|
||||
|
||||
// PublicConfigHandler GET /api/internal/public-config 受信内部端(工位终端)读取的公开配置快照:
|
||||
// 拧紧手填开关 / 多工单缓存策略 / AGV 卸货超时等,供终端按配置显隐或约束交互(2026-11-03 拍板)。
|
||||
// 仅需内部 X-API-TOKEN,不绑定工位会话。
|
||||
// PublicConfigHandler GET /api/internal/public-config?stationNo=N 受信内部端(工位终端)读取的公开配置快照:
|
||||
// 本工位允许手填开关 / 多工单缓存策略 / AGV 卸货超时等,供终端按配置显隐或约束交互。
|
||||
// 2026-11-09 改:允许手填由全局 torque.manual.input 改为按工位 torque.gun.config.N.manualInput,
|
||||
// 终端代理时带自己工位号(登录会话优先、yaml 配置兜底);仅需内部 X-API-TOKEN,不绑定工位会话。
|
||||
func PublicConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
vo, err := logic.New(svcCtx).GetSettings(r.Context())
|
||||
stationNo, _ := strconv.Atoi(r.URL.Query().Get("stationNo"))
|
||||
svc := logic.New(svcCtx)
|
||||
vo, err := svc.GetSettings(r.Context())
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2504, "读取配置失败")
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{
|
||||
"torqueManualInput": vo.TorqueManualInput,
|
||||
"stationNo": stationNo,
|
||||
"torqueManualInput": svc.StationTorqueManualInput(r.Context(), stationNo),
|
||||
"multiOrderCachePolicy": vo.MultiOrderCachePolicy,
|
||||
"agvUnloadTimeoutMinutes": vo.AgvUnloadTimeoutMinutes,
|
||||
})
|
||||
|
||||
@@ -41,6 +41,19 @@ func operator(r *http.Request, fallback string) string {
|
||||
return "system"
|
||||
}
|
||||
|
||||
// StationOptionsInternalHandler GET /api/internal/station/options(内部接口,X-API-TOKEN 保护)
|
||||
// 登录页可选工位清单(实体+虚拟,全部启用),供未配置固定工位的终端登录页下拉(2026-11-09 拍板)。
|
||||
func StationOptionsInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
list, err := logic.New(svcCtx).StationOptions(r.Context())
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2108, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, list)
|
||||
}
|
||||
}
|
||||
|
||||
// StationLoginInternalHandler 工位终端登录(内部接口,X-API-TOKEN 保护)
|
||||
// 校验 用户名 + 工位终端密码 + 工位权限,签发与 MES 同密钥 JWT
|
||||
func StationLoginInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/ent/materialrequest"
|
||||
"bj_power_mes/internal/svc"
|
||||
"bj_power_mes/internal/syncfailure"
|
||||
)
|
||||
|
||||
// CallStatusInternalHandler GET /api/internal/call/status?requestNo=
|
||||
// 供 WMS 同步失败台账重试前判对端终态(已 SHIPPED/DONE 则不再重放通知)。
|
||||
func CallStatusInternalHandler(serverCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
requestNo := strings.TrimSpace(r.URL.Query().Get("requestNo"))
|
||||
if requestNo == "" {
|
||||
httpx.BadRequest(w, "缺少 requestNo")
|
||||
return
|
||||
}
|
||||
mr, err := serverCtx.EntClient.MaterialRequest.Query().
|
||||
Where(materialrequest.RequestNo(requestNo)).Only(r.Context())
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2104, "叫料单不存在: "+requestNo)
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{"requestNo": requestNo, "status": mr.Status,
|
||||
"outboundNo": mr.OutboundNo, "sentQty": mr.SentQty, "reqQty": mr.ReqQty})
|
||||
}
|
||||
}
|
||||
|
||||
// SyncFailureListHandler GET /sync-failures 同步失败台账列表(人工可见,不自动重试)
|
||||
func SyncFailureListHandler(serverCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
rows, err := syncfailure.List(serverCtx.SQLDB, r.URL.Query().Get("status"), r.URL.Query().Get("bizType"))
|
||||
if err != nil {
|
||||
httpx.InternalError(w, "查询同步失败台账失败(部署时请先手工执行迁移 SQL 建表): "+err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, rows)
|
||||
}
|
||||
}
|
||||
|
||||
// SyncFailureRetryHandler POST /sync-failures/retry?id=
|
||||
// 只按台账 endpoint + payload_json 原样重放通知,不重跑任何本地业务。
|
||||
func SyncFailureRetryHandler(serverCtx *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 {
|
||||
httpx.BadRequest(w, "缺少有效的 id")
|
||||
return
|
||||
}
|
||||
row, err := syncfailure.Get(serverCtx.SQLDB, id)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2104, "台账记录不存在: "+err.Error())
|
||||
return
|
||||
}
|
||||
if row.Status == "SUCCESS" {
|
||||
httpx.Ok(w, map[string]any{"id": id, "status": "SUCCESS", "note": "已成功,无需重试"})
|
||||
return
|
||||
}
|
||||
if serverCtx.Wms == nil {
|
||||
httpx.InternalError(w, "WMS 未配置,无法重放通知")
|
||||
return
|
||||
}
|
||||
if err := serverCtx.Wms.PostRaw(r.Context(), row.Endpoint, syncfailure.Payload(row)); err != nil {
|
||||
_ = syncfailure.MarkRetryFailed(serverCtx.SQLDB, id, err.Error())
|
||||
httpx.Fail(w, 2104, "重试失败(已计入 retry_count): "+err.Error())
|
||||
return
|
||||
}
|
||||
_ = syncfailure.MarkSuccess(serverCtx.SQLDB, id)
|
||||
serverCtx.EventLog.Write(r.Context(), "sync.failure.retry", "", "system", "sync_failure",
|
||||
strconv.FormatInt(id, 10), "同步失败台账人工重试成功:"+row.BizType+" / "+row.BizKey, nil)
|
||||
httpx.Ok(w, map[string]any{"id": id, "status": "SUCCESS"})
|
||||
}
|
||||
}
|
||||
|
||||
// SyncFailureIgnoreHandler POST /sync-failures/ignore?id= 线下已处理 → DEAD 留痕
|
||||
func SyncFailureIgnoreHandler(serverCtx *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 {
|
||||
httpx.BadRequest(w, "缺少有效的 id")
|
||||
return
|
||||
}
|
||||
// 处理人取登录态 X-Username(与 WMS syncFailureIgnoreHandler 对齐),
|
||||
// 不再硬编码 "mes-admin";无头时回落 system,绝不写死某个账号。
|
||||
operator := r.Header.Get("X-Username")
|
||||
if operator == "" {
|
||||
operator = "system"
|
||||
}
|
||||
if err := syncfailure.Ignore(serverCtx.SQLDB, id, operator); err != nil {
|
||||
httpx.InternalError(w, "标记已处理失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
serverCtx.EventLog.Write(r.Context(), "sync.failure.ignore", "", operator, "sync_failure",
|
||||
strconv.FormatInt(id, 10), "同步失败台账人工标记已处理", nil)
|
||||
httpx.Ok(w, map[string]any{"id": id, "status": "DEAD"})
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/internal/logic"
|
||||
"bj_power_mes/internal/svc"
|
||||
)
|
||||
|
||||
// TorqueGunConfigHandler GET /api/v1/torque-gun-config 按工位读取拧紧枪展示配置 + 全局允许手填状态。
|
||||
func TorqueGunConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
data, err := logic.New(svcCtx).GetTorqueGunConfig(r.Context())
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2510, "读取拧紧枪配置失败:"+err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, data)
|
||||
}
|
||||
}
|
||||
|
||||
// SaveTorqueGunConfigHandler PUT /api/v1/torque-gun-config 保存 MES 侧展示记录(不下发终端)。
|
||||
func SaveTorqueGunConfigHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
Items []logic.TorqueGunConfig `json:"items"`
|
||||
}
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if err := logic.New(svcCtx).SaveTorqueGunConfig(r.Context(), req.Items, operator(r, "")); err != nil {
|
||||
httpx.Fail(w, 2511, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.OkMessage(w, "已保存(仅本系统展示记录,不下发工位终端)", nil)
|
||||
}
|
||||
}
|
||||
|
||||
// TorqueGunConfigReportHandler POST /api/internal/torque/config/report
|
||||
// 工位终端启动时上报本终端 yaml 的 Tightening 段(X-API-TOKEN 保护),仅作展示记录初始值。
|
||||
func TorqueGunConfigReportHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req logic.TorqueGunReportReq
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if err := logic.New(svcCtx).ReportTorqueGunConfig(r.Context(), req); err != nil {
|
||||
httpx.Fail(w, 2512, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, map[string]any{"reported": true})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user