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