新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
199 lines
6.2 KiB
Go
199 lines
6.2 KiB
Go
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 无调用方,一并删除。
|