feat: 重构 AGV 对接与在制品查询,新增 PLC 手动监控功能
This commit is contained in:
@@ -1,198 +0,0 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"bj_power_wms/internal/mesclient"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
|
||||
// ---------- AGV 配送接口(2026-10-14 改为 MES 透明代理) ----------
|
||||
// AGV 任务与海康 RCS 客户端的唯一真源已迁至 MES;WMS 仅转发,前端(Agv.vue) URL/契约不变。
|
||||
|
||||
// submitAgvHandler POST /api/agv/submit 仓管下发 AGV:代理 MES /api/internal/agv/submit
|
||||
func submitAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置,无法下发 AGV")
|
||||
return
|
||||
}
|
||||
var req struct {
|
||||
Rows []mesclient.AgvSubmitRow `json:"rows"`
|
||||
SourceDock string `json:"sourceDock"`
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
|
||||
return
|
||||
}
|
||||
if len(req.Rows) == 0 {
|
||||
fail(w, http.StatusBadRequest, "请至少选择一批待发料")
|
||||
return
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
if operator == "" {
|
||||
operator = "warehouse"
|
||||
}
|
||||
created, failed, err := ctx.Mes.SubmitAgv(r.Context(), req.Rows, req.SourceDock, operator)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "下发 AGV 失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, map[string]any{"created": created, "failed": failed})
|
||||
}
|
||||
}
|
||||
|
||||
// listAgvTasksHandler GET /api/agv/tasks 查询 AGV 任务(代理 MES,分页契约透传)
|
||||
func listAgvTasksHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置,无法查询 AGV 任务")
|
||||
return
|
||||
}
|
||||
q := r.URL.Query()
|
||||
page := atoi(q.Get("page"), 1)
|
||||
size := atoi(q.Get("pageSize"), 20)
|
||||
data, err := ctx.Mes.ListAgvTasks(r.Context(), q.Get("status"), q.Get("targetDock"), page, size)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "查询 AGV 任务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, data)
|
||||
}
|
||||
}
|
||||
|
||||
// refreshAgvHandler POST /api/agv/refresh 轮询海康 RCS 刷新未终态任务(代理 MES)
|
||||
func refreshAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置")
|
||||
return
|
||||
}
|
||||
changed, err := ctx.Mes.RefreshAgvTasks(r.Context())
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "刷新 AGV 任务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, map[string]any{"changed": changed})
|
||||
}
|
||||
}
|
||||
|
||||
// cancelAgvHandler POST /api/agv/cancel 取消 AGV 任务(代理 MES)
|
||||
func cancelAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置")
|
||||
return
|
||||
}
|
||||
var req struct {
|
||||
TaskNo string `json:"taskNo"`
|
||||
Reason string `json:"reason"`
|
||||
}
|
||||
if err := parseJSON(r, &req); err != nil {
|
||||
fail(w, http.StatusBadRequest, "参数错误: "+err.Error())
|
||||
return
|
||||
}
|
||||
if req.TaskNo == "" {
|
||||
fail(w, http.StatusBadRequest, "缺少任务号")
|
||||
return
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
if operator == "" {
|
||||
operator = "warehouse"
|
||||
}
|
||||
if err := ctx.Mes.CancelAgvTask(r.Context(), req.TaskNo, req.Reason, operator); err != nil {
|
||||
fail(w, http.StatusBadGateway, "取消 AGV 任务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, nil)
|
||||
}
|
||||
}
|
||||
|
||||
// agvModeHandler GET /api/agv/mode 返回 AGV 对接模式(代理 MES)
|
||||
func agvModeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置")
|
||||
return
|
||||
}
|
||||
m, err := ctx.Mes.AgvMode(r.Context())
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "查询 AGV 模式失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, m)
|
||||
}
|
||||
}
|
||||
|
||||
func listDocksHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
typ := q.Get("dockType")
|
||||
// dock 真源已迁 MES:仓库不再本地维护接驳台,改读 MES 内部接口。
|
||||
list, err := ctx.Mes.ListDocks(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "拉取接驳台失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
// 显式构造,避免 omitempty 吞掉 hasPallet=false 导致前端看不到空闲状态
|
||||
type dockView struct {
|
||||
ID int64 `json:"id"`
|
||||
DockCode string `json:"dockCode"`
|
||||
Name string `json:"name"`
|
||||
DockType string `json:"dockType"`
|
||||
StationNo int `json:"stationNo"`
|
||||
Status string `json:"status"`
|
||||
HasPallet bool `json:"hasPallet"`
|
||||
PalletRef string `json:"palletRef"`
|
||||
}
|
||||
views := make([]dockView, 0, len(list))
|
||||
for _, d := range list {
|
||||
if typ != "" && d.DockType != typ {
|
||||
continue
|
||||
}
|
||||
views = append(views, dockView{
|
||||
ID: d.ID,
|
||||
DockCode: d.DockCode,
|
||||
Name: d.Name,
|
||||
DockType: d.DockType,
|
||||
StationNo: d.StationNo,
|
||||
Status: d.Status,
|
||||
HasPallet: d.HasPallet,
|
||||
PalletRef: d.PalletRef,
|
||||
})
|
||||
}
|
||||
ok(w, map[string]any{"list": views})
|
||||
}
|
||||
}
|
||||
|
||||
// listAgvMaterialsHandler 仓管下发 AGV 时拉取 MES 备料单(含 target_dock),本地分页。
|
||||
// MES 内部接口全量返回备料单行;备料单行数可控,内存分页足够。
|
||||
func listAgvMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
q := r.URL.Query()
|
||||
status := q.Get("status")
|
||||
all, err := ctx.Mes.ListMaterialRequests(ctx0(), status)
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, "拉取备料单失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
page := atoi(q.Get("page"), 1)
|
||||
size := atoi(q.Get("pageSize"), 20)
|
||||
if size < 1 || size > 200 {
|
||||
size = 20
|
||||
}
|
||||
total := len(all)
|
||||
start := (page - 1) * size
|
||||
if start > total {
|
||||
start = total
|
||||
}
|
||||
end := start + size
|
||||
if end > total {
|
||||
end = total
|
||||
}
|
||||
ok(w, map[string]any{"list": all[start:end], "total": total, "page": page, "pageSize": size})
|
||||
}
|
||||
}
|
||||
|
||||
// syncDockPalletHandler 已移除(dock 真源迁 MES):接驳台托盘占用状态由 MES 侧 PLC 传感器实时读取,
|
||||
// WMS 不再持有 dock 表,原 /api/internal/dock/pallet-sync 无调用方,一并删除。
|
||||
@@ -44,7 +44,6 @@ var seedPermissions = []seedPerm{
|
||||
{"user:manage", "账号管理", "MENU", "/users", "EditPen", 110, ""},
|
||||
{"role:manage", "角色管理", "MENU", "/roles", "Key", 120, ""},
|
||||
{"eventlog:manage", "操作日志", "MENU", "/event-log", "Clock", 130, ""},
|
||||
{"agv:manage", "AGV配送", "MENU", "/agv", "Van", 135, ""},
|
||||
{"attachment:view", "附件中心", "MENU", "/attachment", "Folder", 138, ""},
|
||||
// ===== 按钮权限 =====
|
||||
{"inbound:create", "批量入库", "BUTTON", "", "", 200, "inbound:view"},
|
||||
@@ -73,7 +72,6 @@ var seedPermissions = []seedPerm{
|
||||
{"role:create", "新增角色", "BUTTON", "", "", 270, "role:manage"},
|
||||
{"role:edit", "编辑角色", "BUTTON", "", "", 271, "role:manage"},
|
||||
{"role:delete", "删除角色", "BUTTON", "", "", 272, "role:manage"},
|
||||
{"agv:dispatch", "下发AGV", "BUTTON", "", "", 280, "agv:manage"},
|
||||
{"return:confirm", "确认收货", "BUTTON", "", "", 205, "return:view"},
|
||||
{"attachment:manage", "归档清理", "BUTTON", "", "", 295, "attachment:view"},
|
||||
// 注:导出权限已按菜单拆分(inbound/outbound/inspection/inventory:export),
|
||||
@@ -139,8 +137,10 @@ func SeedRBAC(ctx *svc.ServiceContext, operator string) (createdP, createdR, bou
|
||||
}
|
||||
}
|
||||
codes := seedRoleCodes()
|
||||
// 退役权限码清理(B5 2026-10-13):工单备料台账页随「自动备料流」退役,ledger:view 及存量角色里的旧码一并摘除(幂等)
|
||||
for _, dead := range []string{"ledger:view"} {
|
||||
// 退役权限码清理(幂等):随功能退役的权限码及存量角色里的旧码一并摘除。
|
||||
// - ledger:view:工单备料台账页随「自动备料流」退役(B5 2026-10-13)
|
||||
// - agv:manage / agv:dispatch:AGV 配送页随 GUI 一并移除,AGV 真源迁 MES(E.1 2026-10-17)
|
||||
for _, dead := range []string{"ledger:view", "agv:manage", "agv:dispatch"} {
|
||||
_, _ = ctx.EntClient.Permission.Delete().Where(permission.CodeEQ(dead)).Exec(ctx0())
|
||||
}
|
||||
if allRoles, _ := ctx.EntClient.Role.Query().All(ctx0()); len(allRoles) > 0 {
|
||||
@@ -148,7 +148,7 @@ func SeedRBAC(ctx *svc.ServiceContext, operator string) (createdP, createdR, bou
|
||||
kept := make([]string, 0, len(rl.PermissionCodes))
|
||||
changed := false
|
||||
for _, c := range rl.PermissionCodes {
|
||||
if c == "ledger:view" {
|
||||
if c == "ledger:view" || c == "agv:manage" || c == "agv:dispatch" {
|
||||
changed = true
|
||||
continue
|
||||
}
|
||||
|
||||
@@ -98,19 +98,6 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
},
|
||||
)
|
||||
|
||||
// AGV 配送(海康 RCS 对接:下发/任务列表/状态轮询/接驳台状态)
|
||||
server.AddRoutes(
|
||||
[]rest.Route{
|
||||
{Method: http.MethodPost, Path: "/api/agv/submit", Handler: requirePerm(ctx, "agv:manage", submitAgvHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/agv/tasks", Handler: requirePerm(ctx, "agv:manage", listAgvTasksHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/agv/refresh", Handler: requirePerm(ctx, "agv:manage", refreshAgvHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/agv/docks", Handler: requirePerm(ctx, "agv:manage", listDocksHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/agv/materials", Handler: requirePerm(ctx, "agv:manage", listAgvMaterialsHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/agv/cancel", Handler: requirePerm(ctx, "agv:manage", cancelAgvHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/agv/mode", Handler: requirePerm(ctx, "agv:manage", agvModeHandler(ctx))},
|
||||
},
|
||||
)
|
||||
|
||||
// 库存
|
||||
server.AddRoutes(
|
||||
[]rest.Route{
|
||||
@@ -144,8 +131,9 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
},
|
||||
)
|
||||
|
||||
// 接驳台主数据已迁 MES(2026-09-21):仓库不再维护 dock 表,也不给接驳台派任务。
|
||||
// 出库目标工位下拉(/api/outbound/stations)、AGV 页接驳台列表(/api/agv/docks) 均改读 MES 内部接口。
|
||||
// 接驳台主数据已迁 MES(2026-09-21,AGV 配送真源 2026-10-14 迁 MES):
|
||||
// 仓库不再维护 dock 表、不再下发/查询 AGV 任务;出库目标工位下拉(/api/outbound/stations) 只读 MES 内部接口。
|
||||
// 「AGV配送」页已随 GUI 一并移除,MES 为 AGV 任务与海康 RCS 客户端唯一真源。
|
||||
|
||||
// 区域(多级父子结构:区域/货架/层/位置号 4 个 Tab)
|
||||
server.AddRoutes(
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
// Package mesclient MES 内部接口客户端(备料单拉取/状态回写,AGV 配送用)。
|
||||
// Package mesclient MES 内部接口客户端(备料单拉取 / 状态回写 / 接驳台与工单主数据只读)。
|
||||
// AGV 配送真源已在 MES,2026-10-17 移除 WMS 侧 AGV 代理方法与 /api/agv/* 路由。
|
||||
package mesclient
|
||||
|
||||
import (
|
||||
@@ -326,145 +327,3 @@ func (e *RespError) Error() string {
|
||||
return "mes call failed with status " + fmt.Sprintf("%d", e.Status)
|
||||
}
|
||||
|
||||
// ============ AGV 调度代理(2026-10-14 AGV 唯一真源迁 MES) ============
|
||||
|
||||
// AgvSubmitRow MES 下发 AGV 行(字段与 MES AgvSubmitRequest 对齐)
|
||||
type AgvSubmitRow struct {
|
||||
RequestNo string `json:"requestNo"`
|
||||
MaterialCode string `json:"materialCode"`
|
||||
MaterialName string `json:"materialName"`
|
||||
Unit string `json:"unit"`
|
||||
Qty float64 `json:"qty"`
|
||||
TargetDock string `json:"targetDock"`
|
||||
}
|
||||
|
||||
// postInternalJSON 通用内部 POST:带 X-API-TOKEN;解析 MES 业务错误(HTTP 200 + body{code≠0} 必须判读)。
|
||||
// 与 postInternal 区别:正确读取 message 字段(MES 统一返回 {code,message,data})。
|
||||
func (c *Client) postInternalJSON(ctx context.Context, path string, body []byte, out any) error {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.baseURL+path, bytes.NewReader(body))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/json")
|
||||
req.Header.Set("X-API-TOKEN", c.token)
|
||||
resp, err := c.hc.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode >= 300 {
|
||||
return &RespError{Status: resp.StatusCode}
|
||||
}
|
||||
var env struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
Data json.RawMessage `json:"data"`
|
||||
}
|
||||
if err := json.NewDecoder(resp.Body).Decode(&env); err != nil {
|
||||
return err
|
||||
}
|
||||
if env.Code != 0 {
|
||||
msg := env.Message
|
||||
if msg == "" {
|
||||
msg = "MES 返回失败"
|
||||
}
|
||||
return fmt.Errorf("%s", msg)
|
||||
}
|
||||
if out != nil && len(env.Data) > 0 {
|
||||
return json.Unmarshal(env.Data, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// getInternalJSON 通用内部 GET:带 X-API-TOKEN;解析 MES 业务错误。
|
||||
func (c *Client) getInternalJSON(ctx context.Context, path string, out any) error {
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, c.baseURL+path, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
req.Header.Set("X-API-TOKEN", c.token)
|
||||
resp, err := c.hc.Do(req)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer resp.Body.Close()
|
||||
if resp.StatusCode >= 300 {
|
||||
return &RespError{Status: resp.StatusCode}
|
||||
}
|
||||
var env struct {
|
||||
Code int `json:"code"`
|
||||
Message string `json:"message"`
|
||||
Data json.RawMessage `json:"data"`
|
||||
}
|
||||
if err := json.NewDecoder(resp.Body).Decode(&env); err != nil {
|
||||
return err
|
||||
}
|
||||
if env.Code != 0 {
|
||||
msg := env.Message
|
||||
if msg == "" {
|
||||
msg = "MES 返回失败"
|
||||
}
|
||||
return fmt.Errorf("%s", msg)
|
||||
}
|
||||
if out != nil && len(env.Data) > 0 {
|
||||
return json.Unmarshal(env.Data, out)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// SubmitAgv 仓管下发 AGV:代理 MES /api/internal/agv/submit(MES 为 AGV 唯一真源,调度海康 RCS)
|
||||
func (c *Client) SubmitAgv(ctx context.Context, rows []AgvSubmitRow, sourceDock, operator string) (int, []string, error) {
|
||||
b, _ := json.Marshal(map[string]any{"rows": rows, "sourceDock": sourceDock, "operator": operator})
|
||||
var data struct {
|
||||
Created int `json:"created"`
|
||||
Failed []string `json:"failed"`
|
||||
}
|
||||
if err := c.postInternalJSON(ctx, "/api/internal/agv/submit", b, &data); err != nil {
|
||||
return 0, nil, err
|
||||
}
|
||||
return data.Created, data.Failed, nil
|
||||
}
|
||||
|
||||
// ListAgvTasks 查询 AGV 任务(代理 MES,分页契约透传 {list,total,page,pageSize})
|
||||
func (c *Client) ListAgvTasks(ctx context.Context, status, targetDock string, page, size int) (map[string]any, error) {
|
||||
q := url.Values{}
|
||||
if status != "" {
|
||||
q.Set("status", status)
|
||||
}
|
||||
if targetDock != "" {
|
||||
q.Set("targetDock", targetDock)
|
||||
}
|
||||
q.Set("page", strconv.Itoa(page))
|
||||
q.Set("pageSize", strconv.Itoa(size))
|
||||
var data map[string]any
|
||||
if err := c.getInternalJSON(ctx, "/api/internal/agv/tasks?"+q.Encode(), &data); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
|
||||
// RefreshAgvTasks 轮询海康 RCS 刷新未终态任务(代理 MES)
|
||||
func (c *Client) RefreshAgvTasks(ctx context.Context) (int, error) {
|
||||
var data struct {
|
||||
Changed int `json:"changed"`
|
||||
}
|
||||
if err := c.postInternalJSON(ctx, "/api/internal/agv/refresh", []byte("{}"), &data); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return data.Changed, nil
|
||||
}
|
||||
|
||||
// CancelAgvTask 取消 AGV 任务(代理 MES)
|
||||
func (c *Client) CancelAgvTask(ctx context.Context, taskNo, reason, operator string) error {
|
||||
b, _ := json.Marshal(map[string]any{"taskNo": taskNo, "reason": reason, "operator": operator})
|
||||
return c.postInternalJSON(ctx, "/api/internal/agv/cancel", b, nil)
|
||||
}
|
||||
|
||||
// AgvMode 返回 AGV 对接模式(代理 MES)
|
||||
func (c *Client) AgvMode(ctx context.Context) (map[string]any, error) {
|
||||
var data map[string]any
|
||||
if err := c.getInternalJSON(ctx, "/api/internal/agv/mode", &data); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user