- 同步失败台账:MES/WMS 双端新增台账与页面,跨系统通知失败落台账、人工重试或标记已处理,不自动重传;重试前先判对端终态;叫料、配送、出库回写失败提示指向台账;补幂等建表脚本与菜单权限。 - 拧紧枪:新增按工位配置页,展示控制器地址与三把枪通道号(仅供查看,不参与采集校验);「允许手填」由全局开关改为每工位开关,关闭时校验该工位已配控制器;终端启动/登录上报配置并按本工位拉取,扭矩手填框按本工位置灰;补全局值迁移到各工位的脚本。 - 工位体系:终端未配置工位号时登录页可选(含虚拟工位),固定工位模式保留;虚拟/线下位不叫料、不退料、不作转产目标,未采集绑定放行并说明原因;叫料期望接驳台改为选填。 - AGV与出库:补「出库单已送达」回写;空车回充、接驳台传感器失联、配送状态更新失败均落预警或留痕并提示人工核对;人工出库不引入送达状态;出库单支持目标工位/接驳台并扩展导出列。 - 基础设施:看板缓存由Redis改为MES进程内实现,文档与启动脚本同步去Redis;扫码监听支持多地址、端口被占自动降级;PLC对账与工位报警在MES不可达时降级放行并留日志。 - 文档与帮助:案例与部署手册按实测订正(工位绑定、菜单名称、补料由班组长代提、菜单覆盖对照、虚拟工位);迁移脚本改为本地即时执行并登记7个已执行脚本;三端页面帮助改为「业务/操作/影响范围/后果」四要素。 - 测试:新增独立Go模块,按三个业务场景做真实HTTP与真实写库的流水测试,含运行报告。
143 lines
5.3 KiB
Go
143 lines
5.3 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"errors"
|
||
"fmt"
|
||
"io"
|
||
"net/http"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"bj_power_workstation/internal/mes"
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// tighteningRecordHandler POST /api/tightening/record —— 录入一条拧紧数据。
|
||
// 真实场景:工件走到「需要拧紧枪」的工艺步骤时界面聚焦拧紧输入框,人工操作拧紧枪把采集到的
|
||
// 扭矩值打入输入框回车 → 本接口实时直连 MES /api/internal/torque/report 上报。
|
||
// 2026-11-05 拍板:断网即失败(无本地缓存/离线队列/自动重试),操作失败工人重做即可;
|
||
// 本地仅记操作日志(审计),不再落 torque_results 表。
|
||
// 入参 {sn, workOrderNo, stepId, stepName, screwNo, torque, angle, result, operator};
|
||
// result 由前端按该步骤考核标准(扭矩 RANGE)判定后传入,非 NG 一律记 OK。
|
||
func tighteningRecordHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
payload, err := io.ReadAll(r.Body)
|
||
if err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体读取失败")
|
||
return
|
||
}
|
||
var req struct {
|
||
Sn string `json:"sn"`
|
||
WorkOrderNo string `json:"workOrderNo"`
|
||
StepId string `json:"stepId"`
|
||
StepName string `json:"stepName"`
|
||
ScrewNo string `json:"screwNo"`
|
||
Torque float64 `json:"torque"`
|
||
Angle float64 `json:"angle"`
|
||
Result string `json:"result"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少工件 SN,请先上料")
|
||
return
|
||
}
|
||
if strings.TrimSpace(req.StepId) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少拧紧工艺步骤")
|
||
return
|
||
}
|
||
if req.Result != "NG" {
|
||
req.Result = "OK"
|
||
}
|
||
// 方案 B:操作人取自工位登录态可信身份,忽略浏览器请求体里的 operator(防冒名)
|
||
ss, _ := ctx.Store.GetStationSession()
|
||
op := req.Operator
|
||
if ss != nil && ss.Name != "" {
|
||
op = ss.Name
|
||
}
|
||
// 拧紧域工位标签载体:DOCK%02d 由业务工位号生成(与接驳台 dock 表编码无关),
|
||
// MES 侧按 stationNo(数字工位号)落库并做应拧/实拧分组统计。
|
||
// 2026-11-09:选择模式(配置<=0)用登录会话工位(stationNoFromRequest 统一口径)。
|
||
bizStationNo := stationNoFromRequest(ctx)
|
||
dockCode := fmt.Sprintf("DOCK%02d", bizStationNo)
|
||
body := map[string]any{
|
||
"workOrderNo": req.WorkOrderNo,
|
||
"sn": req.Sn,
|
||
"dockCode": dockCode,
|
||
"stationNo": strconv.Itoa(bizStationNo),
|
||
"screwNo": req.ScrewNo,
|
||
"stepId": req.StepId,
|
||
"stepName": req.StepName,
|
||
"torque": req.Torque,
|
||
"angle": req.Angle,
|
||
"result": req.Result,
|
||
"operator": op,
|
||
}
|
||
if _, _, err := ctx.Mes.Post("/api/internal/torque/report", body); err != nil {
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_rejected",
|
||
fmt.Sprintf("拧紧录入被MES拒绝 sn=%s 步骤=%s:%s", req.Sn, req.StepName, msg))
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无本地缓存/自动重试,工人重做即可)
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record_failed",
|
||
fmt.Sprintf("拧紧录入失败(MES不可达) sn=%s 步骤=%s 扭矩=%.1f", req.Sn, req.StepName, req.Torque))
|
||
logx.Errorf("拧紧录入上报失败(MES不可达): %v", err)
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达,拧紧数据未保存,请检查网络后重新录入")
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.WorkOrderNo, op, "torque_record",
|
||
fmt.Sprintf("拧紧录入 sn=%s 步骤=%s 扭矩=%.1f 结果=%s", req.Sn, req.StepName, req.Torque, req.Result))
|
||
ok(w, map[string]any{"result": req.Result})
|
||
}
|
||
}
|
||
|
||
// tighteningLiveHandler GET /api/tightening/live —— 返回 OP 控制器最近推送、尚未确认上报的拧紧结果(前端轮询预填)。
|
||
func tighteningLiveHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
if ctx.Tightening == nil || !ctx.Tightening.Enabled() {
|
||
ok(w, map[string]any{"enabled": false, "list": []any{}})
|
||
return
|
||
}
|
||
ok(w, map[string]any{"enabled": true, "list": ctx.Tightening.Latest()})
|
||
}
|
||
}
|
||
|
||
// tighteningConsumeHandler POST /api/tightening/consume —— 操作工点「完成」后标记某条 OP 缓冲结果为已确认(防重复上报)。
|
||
// 入参 {id}。
|
||
func tighteningConsumeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
payload, err := io.ReadAll(r.Body)
|
||
if err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体读取失败")
|
||
return
|
||
}
|
||
var req struct {
|
||
ID int64 `json:"id"`
|
||
}
|
||
if err := json.Unmarshal(payload, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if req.ID <= 0 {
|
||
fail(w, http.StatusBadRequest, "缺少缓冲结果 ID")
|
||
return
|
||
}
|
||
if ctx.Tightening != nil {
|
||
ctx.Tightening.Consume(req.ID)
|
||
}
|
||
ok(w, map[string]any{"ok": true})
|
||
}
|
||
} |