【MES】 - AGV点位/线路点位/AGV任务/工单 ent schema 重构(全量重生成 ent 代码) - 新增派车锁 agv_point_lock.go:目标点位占用即拒车,JBT21 库房接驳台卸货后保持锁定待库管手动解锁 - 新增进程内 TTL 缓存 cache.go,由 Redis 看板缓存迁移至内存(singleflight 防击穿,去除外部依赖) - AGV 三段链安全机制、车辆状态/接驳台左右互换、补料损耗闭环完善 - 来料检/工序卡/工单/质检/日排产/AGV 前端与帮助文档更新 - 新增 migrations/、sql/ 目录 【WMS】 - 出库、Excel 导出、物料、路由处理增强 - 配置与 DB 初始化调整;基础数据/成品入库/入库前端调整 【工位终端】 - 移除离线同步队列(syncer 包、sync.go、SyncQueueDialog.vue),改为实时直连上报 MES(断网即失败报错),以本人身份操作 - 本地 SQLite 仅保留操作日志 + 内置账号 + 登录态;保留空闲自动登出 【文档】 - 删除 AGV海康litev1.5.md;案例.md 更新
219 lines
8.1 KiB
Go
219 lines
8.1 KiB
Go
package handler
|
||
|
||
import (
|
||
"encoding/json"
|
||
"errors"
|
||
"io"
|
||
"net/http"
|
||
"net/url"
|
||
"strings"
|
||
|
||
"bj_power_workstation/internal/mes"
|
||
"bj_power_workstation/internal/svc"
|
||
|
||
"github.com/zeromicro/go-zero/core/logx"
|
||
)
|
||
|
||
// passJSON 原样透传 MES 的 {code,message,data} 响应体(不再二次包装)。
|
||
func passJSON(w http.ResponseWriter, body []byte) {
|
||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
||
w.WriteHeader(http.StatusOK)
|
||
_, _ = w.Write(body)
|
||
}
|
||
|
||
// wipHandler GET /api/wip?stationNo=(>0=停在该工位)/ ?scope=(pending=待流转 / end-pending=末端待取件)
|
||
// —— 代理 MES /api/internal/workpieces/in-process。
|
||
// 在制品默认展示(5.2):停在本工位的未完工工件列表;上下线面板按 scope 拉待流转/末端待取件。
|
||
func wipHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if sn := strings.TrimSpace(r.URL.Query().Get("stationNo")); sn != "" {
|
||
params.Set("stationNo", sn)
|
||
}
|
||
if sc := strings.TrimSpace(r.URL.Query().Get("scope")); sc != "" {
|
||
params.Set("scope", sc)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/workpieces/in-process", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// bomHandler GET /api/bom?productCode=&bomName= —— 代理 MES /api/internal/bom。
|
||
// 上线建档「领料确认」按物料清单展示应领料。
|
||
func bomHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("productCode")); v != "" {
|
||
params.Set("productCode", v)
|
||
}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("bomName")); v != "" {
|
||
params.Set("bomName", v)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/bom", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// orderQueryHandler GET /api/order/query?orderNo= —— 代理 MES /api/internal/order/query。
|
||
// 上线建档选工单后带出产品编码/名称(用于查物料清单应领料)。
|
||
func orderQueryHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
params := url.Values{}
|
||
if v := strings.TrimSpace(r.URL.Query().Get("orderNo")); v != "" {
|
||
params.Set("orderNo", v)
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/order/query", params)
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// traceHandler GET /api/trace?sn= —— 代理 MES /api/internal/workpiece/trace。
|
||
// 下线完工面板扫 SN 后展示工件状态/工序时间线/拧紧等追溯信息。
|
||
func traceHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
sn := strings.TrimSpace(r.URL.Query().Get("sn"))
|
||
if sn == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn 参数")
|
||
return
|
||
}
|
||
body, _, err := ctx.Mes.Get("/api/internal/workpiece/trace", url.Values{"sn": {sn}})
|
||
if err != nil {
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达:"+errString(err))
|
||
return
|
||
}
|
||
passJSON(w, body)
|
||
}
|
||
}
|
||
|
||
// onlineHandler POST /api/workpiece/online —— 上线建档(StationNo=0)。
|
||
// {sn, orderNo, workOrderId, processSeq, operator};MES 不可达时写离线队列(kind=online_register)稍后重传。
|
||
func onlineHandler(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"`
|
||
OrderNo string `json:"orderNo"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
_ = json.Unmarshal(payload, &req)
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||
return
|
||
}
|
||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||
opName := req.Operator
|
||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||
opName = ss.Name
|
||
}
|
||
q := url.Values{}
|
||
if req.Operator != "" {
|
||
q.Set("operator", req.Operator)
|
||
}
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/online?"+q.Encode(), json.RawMessage(payload))
|
||
if err != nil {
|
||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected",
|
||
"上线建档被MES拒绝 sn="+req.Sn+":"+msg)
|
||
logx.Errorf("上线建档被 MES 拒绝: %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_failed", "上线建档失败(MES不可达) sn="+req.Sn)
|
||
logx.Errorf("上线建档失败(MES不可达): %v", err)
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达,建档未成功,请检查网络后重试")
|
||
return
|
||
}
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register_rejected",
|
||
"上线建档被MES拒绝 sn="+req.Sn+":"+msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog(req.OrderNo, opName, "online_register", "上线建档 sn="+req.Sn)
|
||
// 透传 MES 响应(data 即 PLC↔MES 对账 mismatch 对象,无对账时为 null),
|
||
// 供前端建档成功后按需弹「两项」提示。
|
||
passJSON(w, respBody)
|
||
}
|
||
}
|
||
|
||
// doneHandler POST /api/workpiece/done —— 下线完工入库(StationNo=13)。
|
||
// {sn, batchItems, serialItems, operator};完工内部自动回流 WMS 成品库存;
|
||
// MES 不可达时写离线队列(kind=offline_finish)稍后重传。
|
||
func doneHandler(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"`
|
||
Operator string `json:"operator"`
|
||
}
|
||
_ = json.Unmarshal(payload, &req)
|
||
if strings.TrimSpace(req.Sn) == "" {
|
||
fail(w, http.StatusBadRequest, "缺少 sn")
|
||
return
|
||
}
|
||
// 操作人取工位登录态可信身份(防冒名),仅用于本地操作日志落痕
|
||
opName := req.Operator
|
||
if ss, sErr := ctx.Store.GetStationSession(); sErr == nil && ss != nil && ss.Name != "" {
|
||
opName = ss.Name
|
||
}
|
||
q := url.Values{}
|
||
if req.Operator != "" {
|
||
q.Set("operator", req.Operator)
|
||
}
|
||
respBody, _, err := ctx.Mes.Post("/api/internal/workpiece/done?"+q.Encode(), json.RawMessage(payload))
|
||
if err != nil {
|
||
// MES 业务拒绝(HTTP200+code≠0):数据不合法,直接失败回前端
|
||
var bizErr *mes.BizError
|
||
if errors.As(err, &bizErr) {
|
||
msg := mesRespCode(bizErr.Body)
|
||
if msg == "" {
|
||
msg = bizErr.Error()
|
||
}
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg)
|
||
logx.Errorf("下线完工被 MES 拒绝: %s", msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
// 网络失败:直接报错(2026-11-05 拍板:断网即失败,无离线队列/自动重试,工人重做即可)
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_failed", "下线完工失败(MES不可达) sn="+req.Sn)
|
||
logx.Errorf("下线完工失败(MES不可达): %v", err)
|
||
fail(w, http.StatusBadGateway, "MES 服务不可达,完工未成功,请检查网络后重试")
|
||
return
|
||
}
|
||
if msg := mesRespCode(respBody); msg != "" {
|
||
ctx.Store.AddEventLog("", opName, "offline_finish_rejected", "下线完工被MES拒绝 sn="+req.Sn+":"+msg)
|
||
fail(w, http.StatusConflict, msg)
|
||
return
|
||
}
|
||
ctx.Store.AddEventLog("", opName, "offline_finish", "下线完工入库 sn="+req.Sn)
|
||
ok(w, map[string]any{"ok": true})
|
||
}
|
||
}
|