feat: 实现 PLC↔MES 对账功能(#8),包含终端触发与系统触发逻辑
新增功能: 1. 新增 PLC 客户端接口 QueryStationPallet,支持 mock 与真实 PLC 寄存器读取 2. 新增对账检测逻辑,覆盖 11 个工位(G1~G10 + C15) 3. 事件驱动触发:终端 T2/T3/T5 触发单工位检测,T4 报工命中则阻断;T6/T7 系统触发全量检测并落预警中心 4. 新增路由、handler、logic、测试用例及帮助文档,完成对账全链路实现
This commit is contained in:
@@ -0,0 +1,76 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"bj_power_mes/common/httpx"
|
||||
"bj_power_mes/internal/logic"
|
||||
"bj_power_mes/internal/svc"
|
||||
)
|
||||
|
||||
// PlcMismatchCheckReq PLC↔MES 对账检查请求(终端 T2/T3 / 系统 T6/T7 共用,事件驱动,禁止定时轮询)。
|
||||
// - StationNo > 0:单工位检查(T2 终端开始作业 / T3 扫 SN)
|
||||
// - StationNo == 0:全量 11 位检查(T6 PLC 通讯恢复 / T7 管理员手动核对)
|
||||
// - Trigger:terminal(T2/T3)/ plc_recover(T6)/ manual(T7);缺省 terminal
|
||||
type PlcMismatchCheckReq struct {
|
||||
StationNo int `json:"stationNo"`
|
||||
Trigger string `json:"trigger"`
|
||||
OrderNo string `json:"orderNo"`
|
||||
Operator string `json:"operator"`
|
||||
}
|
||||
|
||||
// PlcMismatchCheckResp 对账检查响应(契约:工位终端据此弹四选对话框)。
|
||||
// 单工位(StationNo>0)时填充 HasMismatch/StationNo/PlcBit/Detail;
|
||||
// 全量(StationNo==0)时填充 Items(命中列表)。
|
||||
type PlcMismatchCheckResp struct {
|
||||
HasMismatch bool `json:"hasMismatch"`
|
||||
StationNo int `json:"stationNo"`
|
||||
PlcBit int `json:"plcBit"`
|
||||
Detail string `json:"detail"`
|
||||
Options []string `json:"options"`
|
||||
GraceWindow bool `json:"graceWindow"`
|
||||
Items []logic.PlcMesMismatch `json:"items,omitempty"`
|
||||
}
|
||||
|
||||
// PlcMismatchCheckInternalHandler POST /api/internal/plc/mismatch/check
|
||||
// PLC↔MES 对账检查入口:单工位检查(T2/T3)→ 弹终端;全量检查(T6/T7)→ 落预警中心。
|
||||
func PlcMismatchCheckInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
var req PlcMismatchCheckReq
|
||||
if err := httpx.ParseJSON(r, &req); err != nil {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
op := operator(r, req.Operator)
|
||||
trigger := req.Trigger
|
||||
if trigger == "" {
|
||||
trigger = "terminal"
|
||||
}
|
||||
if req.StationNo > 0 {
|
||||
m, err := logic.New(svcCtx).CheckStationMismatch(r.Context(), req.StationNo, trigger, req.OrderNo, op)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2401, err.Error())
|
||||
return
|
||||
}
|
||||
resp := PlcMismatchCheckResp{StationNo: req.StationNo, Options: logic.MismatchOptions()}
|
||||
if m != nil {
|
||||
resp.HasMismatch = true
|
||||
resp.PlcBit = m.PlcBit
|
||||
resp.Detail = m.Detail
|
||||
}
|
||||
httpx.Ok(w, resp)
|
||||
return
|
||||
}
|
||||
// 全量 11 位(T6 PLC 通讯恢复 / T7 管理员手动核对)→ 落预警中心
|
||||
list, err := logic.New(svcCtx).CheckAllMismatch(r.Context(), trigger, op)
|
||||
if err != nil {
|
||||
httpx.Fail(w, 2402, err.Error())
|
||||
return
|
||||
}
|
||||
httpx.Ok(w, PlcMismatchCheckResp{
|
||||
HasMismatch: len(list) > 0,
|
||||
Options: logic.MismatchOptions(),
|
||||
Items: list,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -275,11 +275,11 @@ func OnlineWorkpieceInternalHandler(svcCtx *svc.ServiceContext) http.HandlerFunc
|
||||
return
|
||||
}
|
||||
LogImpersonation(svcCtx, r, r.URL.Query().Get("operator"), "/api/internal/workpiece/online")
|
||||
if msg, err := logic.New(svcCtx).OnlineWorkpiece(r.Context(), req, StationOp(r, r.URL.Query().Get("operator"))); err != nil {
|
||||
if msg, mm, err := logic.New(svcCtx).OnlineWorkpiece(r.Context(), req, StationOp(r, r.URL.Query().Get("operator"))); err != nil {
|
||||
httpx.Fail(w, 2007, err.Error())
|
||||
return
|
||||
} else {
|
||||
httpx.OkMessage(w, msg, nil)
|
||||
httpx.OkMessage(w, msg, mm)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,11 +23,11 @@ func OnlineWorkpieceHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
|
||||
httpx.BadRequest(w, "请求体解析失败")
|
||||
return
|
||||
}
|
||||
if msg, err := logic.New(svcCtx).OnlineWorkpiece(r.Context(), req, operator(r, "")); err != nil {
|
||||
if msg, mm, err := logic.New(svcCtx).OnlineWorkpiece(r.Context(), req, operator(r, "")); err != nil {
|
||||
httpx.Fail(w, 3301, err.Error())
|
||||
return
|
||||
} else {
|
||||
httpx.OkMessage(w, msg, nil)
|
||||
httpx.OkMessage(w, msg, mm)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,6 +205,9 @@ func RegisterProductionRoutes(server *rest.Server, serverCtx *svc.ServiceContext
|
||||
{Method: http.MethodPost, Path: "/plc/send-process", Handler: production.PlcSendProcessHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/plc/send-logs", Handler: production.PlcSendLogsHandler(serverCtx)},
|
||||
|
||||
// PLC↔MES 对账检查(#8):终端 T2/T3 单工位(弹终端)、系统 T6/T7 全量 11 位(落预警中心)。事件驱动,禁止定时轮询。
|
||||
{Method: http.MethodPost, Path: "/plc/mismatch/check", Handler: PlcMismatchCheckInternalHandler(serverCtx)},
|
||||
|
||||
{Method: http.MethodPost, Path: "/torque/report", Handler: production.TorqueReportHandler(serverCtx)},
|
||||
{Method: http.MethodGet, Path: "/torque/records", Handler: production.TorqueRecordsHandler(serverCtx)},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user