feat: 多系统新增扫码中间件与 AGV 对接,优化拧紧与退库流程
新增扫码中间件支持网络型扫码枪键盘注入,AGV 对接从 WMS 迁至 MES 统一管理;新增拧紧不合格人工处置与 PLC 对账机制,优化退库单关联与工位终端功能,同时清理旧 AGV 任务表,完善数据库与配置项。
This commit is contained in:
@@ -1,41 +1,26 @@
|
||||
package handler
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"bj_power_wms/ent"
|
||||
"bj_power_wms/ent/agvtask"
|
||||
"bj_power_wms/ent/outboundorder"
|
||||
"bj_power_wms/internal/mesclient"
|
||||
"bj_power_wms/internal/svc"
|
||||
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
// ---------- AGV 配送接口 ----------
|
||||
|
||||
// submitAgvRequest 仓管下发 AGV:至少选一批待发料行,按 target_dock 聚合生成任务
|
||||
type submitAgvRequest struct {
|
||||
// rows: 待发料行(每行含 requestNo/物料/数量/targetDock),来自 MES 备料单
|
||||
Rows []agvSubmitRow `json:"rows"`
|
||||
// 也可以直接给一个 group:sourceDock + 多目标
|
||||
SourceDock string `json:"sourceDock"`
|
||||
}
|
||||
|
||||
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"`
|
||||
}
|
||||
// ---------- 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) {
|
||||
var req submitAgvRequest
|
||||
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
|
||||
@@ -44,174 +29,61 @@ func submitAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "请至少选择一批待发料")
|
||||
return
|
||||
}
|
||||
source := req.SourceDock
|
||||
if source == "" {
|
||||
source = "DOCK21"
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
|
||||
// 按 target_dock 聚合
|
||||
groups := map[string][]agvSubmitRow{}
|
||||
for _, row := range req.Rows {
|
||||
if row.TargetDock == "" {
|
||||
continue
|
||||
}
|
||||
groups[row.TargetDock] = append(groups[row.TargetDock], row)
|
||||
if operator == "" {
|
||||
operator = "warehouse"
|
||||
}
|
||||
if len(groups) == 0 {
|
||||
fail(w, http.StatusBadRequest, "所选料行缺少目标接驳台(targetDock)")
|
||||
created, failed, err := ctx.Mes.SubmitAgv(r.Context(), req.Rows, req.SourceDock, operator)
|
||||
if err != nil {
|
||||
fail(w, http.StatusBadGateway, "下发 AGV 失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
created := 0
|
||||
failed := []string{}
|
||||
for target, rows := range groups {
|
||||
// 1. 生成我方任务号并落库(PENDING→下发)
|
||||
taskNo := "AGV" + strings.ToUpper(uuid.NewString()[:10])
|
||||
mats, _ := json.Marshal(rows)
|
||||
t, err := ctx.EntClient.AgvTask.Create().
|
||||
SetTaskNo(taskNo).
|
||||
SetSourceDock(source).
|
||||
SetTargetDock(target).
|
||||
SetMaterialsJSON(string(mats)).
|
||||
SetStatus("PENDING").
|
||||
SetOperator(operator).
|
||||
SetDispatchedAt(0).
|
||||
SetArrivedAt(0).
|
||||
Save(ctx0())
|
||||
if err != nil {
|
||||
failed = append(failed, target)
|
||||
continue
|
||||
}
|
||||
// 2. 调海康 RCS 下发
|
||||
robCode, aerr := ctx.Agv.SubmitTask(ctx0(), source, target, "")
|
||||
if aerr != nil {
|
||||
ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetStatus("FAILED").SetRemark("RCS下发失败: "+aerr.Error()).
|
||||
Exec(ctx0())
|
||||
failed = append(failed, target)
|
||||
continue
|
||||
}
|
||||
ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetHikTaskCode(robCode).
|
||||
SetStatus("DISPATCHED").
|
||||
SetDispatchedAt(time.Now().Unix()).
|
||||
Exec(ctx0())
|
||||
// 3. 回写 MES 备料单 → DELIVERING
|
||||
for _, row := range rows {
|
||||
_ = ctx.Mes.MarkStatus(ctx0(), row.RequestNo, "DELIVERING")
|
||||
}
|
||||
// 4. 记录事件日志
|
||||
ctx.EventLog.Write(ctx0(), "agv.dispatch", operator, "agv_task", taskNo,
|
||||
"下发AGV搬运 "+source+"→"+target, map[string]any{"rows": len(rows)})
|
||||
created++
|
||||
}
|
||||
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()
|
||||
query := ctx.EntClient.AgvTask.Query()
|
||||
if st := q.Get("status"); st != "" {
|
||||
query = query.Where(agvtask.Status(st))
|
||||
}
|
||||
if dock2 := q.Get("targetDock"); dock2 != "" {
|
||||
query = query.Where(agvtask.TargetDock(dock2))
|
||||
}
|
||||
page := atoi(q.Get("page"), 1)
|
||||
size := atoi(q.Get("pageSize"), 20)
|
||||
if size < 1 || size > 200 {
|
||||
size = 20
|
||||
}
|
||||
total, err := query.Clone().Count(ctx0())
|
||||
data, err := ctx.Mes.ListAgvTasks(r.Context(), q.Get("status"), q.Get("targetDock"), page, size)
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
fail(w, http.StatusBadGateway, "查询 AGV 任务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
list, err := query.
|
||||
Order(ent.Desc("created_at")).
|
||||
Offset((page - 1) * size).Limit(size).
|
||||
All(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
return
|
||||
}
|
||||
ok(w, map[string]any{"list": list, "total": total, "page": page, "pageSize": size})
|
||||
ok(w, data)
|
||||
}
|
||||
}
|
||||
|
||||
// refreshAgvHandler 轮询海康 RCS 更新各任务状态
|
||||
// refreshAgvHandler POST /api/agv/refresh 轮询海康 RCS 刷新未终态任务(代理 MES)
|
||||
func refreshAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
// 取所有未终态(DISPATCHED/DELIVERING)且已下发的任务
|
||||
list, err := ctx.EntClient.AgvTask.Query().
|
||||
Where(
|
||||
agvtask.StatusIn("DISPATCHED", "DELIVERING"),
|
||||
agvtask.HikTaskCodeNEQ(""),
|
||||
).All(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
if ctx.Mes == nil {
|
||||
fail(w, http.StatusInternalServerError, "MES 未配置")
|
||||
return
|
||||
}
|
||||
changed := 0
|
||||
for _, t := range list {
|
||||
st, qerr := ctx.Agv.QueryTask(ctx0(), t.HikTaskCode)
|
||||
if qerr != nil {
|
||||
continue
|
||||
}
|
||||
// 海康状态映射到我们的状态
|
||||
our := mapHikStatus(st)
|
||||
if our == "DONE" {
|
||||
ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetStatus("DONE").SetArrivedAt(time.Now().Unix()).
|
||||
Exec(ctx0())
|
||||
// 出库单配送状态 → 已送达(仅在绑定了出库单号时;出库单状态只有 已出库/已送达,
|
||||
// 「已接料」归 MES 备料单,避免三处状态互斗)。
|
||||
if t.RelatedOutboundNo != "" {
|
||||
ctx.EntClient.OutboundOrder.Update().
|
||||
Where(outboundorder.OutboundNoEQ(t.RelatedOutboundNo)).
|
||||
SetStatus("已送达").Exec(ctx0())
|
||||
}
|
||||
// 到位后回写 MES 备料单 → DONE
|
||||
mats := []agvSubmitRow{}
|
||||
_ = json.Unmarshal([]byte(t.MaterialsJSON), &mats)
|
||||
for _, row := range mats {
|
||||
_ = ctx.Mes.MarkStatus(ctx0(), row.RequestNo, "DONE")
|
||||
}
|
||||
ctx.EventLog.Write(ctx0(), "agv.arrive", r.Header.Get("X-Username"), "agv_task", t.TaskNo,
|
||||
"AGV已到位 "+t.TargetDock, nil)
|
||||
changed++
|
||||
} else if our != "" && t.Status != our && our == "DELIVERING" {
|
||||
ctx.EntClient.AgvTask.UpdateOneID(t.ID).SetStatus("DELIVERING").Exec(ctx0())
|
||||
changed++
|
||||
}
|
||||
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})
|
||||
}
|
||||
}
|
||||
|
||||
// mapHikStatus 海康 taskStatus → 我方状态
|
||||
// 海康: QUEUE/WAIT/EXECUTING/MANUALED/FINISHED/CANCELLED
|
||||
func mapHikStatus(s string) string {
|
||||
switch s {
|
||||
case "EXECUTING", "DELIVERING":
|
||||
return "DELIVERING"
|
||||
case "FINISHED", "MANUALED":
|
||||
return "DONE"
|
||||
case "CANCELLED":
|
||||
return "CANCELLED"
|
||||
default: // QUEUE / WAIT / 未知
|
||||
return "DISPATCHED"
|
||||
}
|
||||
}
|
||||
|
||||
// cancelAgvHandler 取消 AGV 任务(软取消)。
|
||||
// 已下发(DISPATCHED/DELIVERING)的调海康 RCS task/cancel;本地任务置 CANCELLED,
|
||||
// 并把关联的 MES 备料单行从 DELIVERING 退回待发料状态。
|
||||
// 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"`
|
||||
@@ -224,57 +96,31 @@ func cancelAgvHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
fail(w, http.StatusBadRequest, "缺少任务号")
|
||||
return
|
||||
}
|
||||
t, err := ctx.EntClient.AgvTask.Query().Where(agvtask.TaskNo(req.TaskNo)).First(ctx0())
|
||||
if err != nil {
|
||||
fail(w, http.StatusNotFound, "AGV 任务不存在")
|
||||
return
|
||||
}
|
||||
if t.Status == "DONE" || t.Status == "CANCELLED" {
|
||||
fail(w, http.StatusBadRequest, "任务已结束,无法取消")
|
||||
return
|
||||
}
|
||||
operator := r.Header.Get("X-Username")
|
||||
// 已下发的先通知 RCS 取消
|
||||
if t.HikTaskCode != "" && (t.Status == "DISPATCHED" || t.Status == "DELIVERING") {
|
||||
if cerr := ctx.Agv.CancelTask(ctx0(), t.HikTaskCode, "CANCEL", req.Reason); cerr != nil {
|
||||
fail(w, http.StatusBadGateway, "RCS 取消失败: "+cerr.Error())
|
||||
return
|
||||
}
|
||||
if operator == "" {
|
||||
operator = "warehouse"
|
||||
}
|
||||
if err := ctx.EntClient.AgvTask.UpdateOneID(t.ID).
|
||||
SetStatus("CANCELLED").SetRemark(req.Reason).Exec(ctx0()); err != nil {
|
||||
fail(w, http.StatusInternalServerError, err.Error())
|
||||
if err := ctx.Mes.CancelAgvTask(r.Context(), req.TaskNo, req.Reason, operator); err != nil {
|
||||
fail(w, http.StatusBadGateway, "取消 AGV 任务失败: "+err.Error())
|
||||
return
|
||||
}
|
||||
// 关联备料单行退回待发料
|
||||
mats := []agvSubmitRow{}
|
||||
_ = json.Unmarshal([]byte(t.MaterialsJSON), &mats)
|
||||
for _, row := range mats {
|
||||
// 取消 AGV 后,关联备料单行回退至「待备料」(PENDING),与 MES 备料单词表对齐
|
||||
if err := ctx.Mes.MarkStatus(ctx0(), row.RequestNo, "PENDING"); err != nil {
|
||||
ctx.EventLog.Write(ctx0(), "agv.cancel.material_rollback_failed", operator, "material_request", row.RequestNo,
|
||||
"取消AGV后备料单回退待备料失败: "+err.Error(), map[string]any{"requestNo": row.RequestNo, "error": err.Error()})
|
||||
}
|
||||
}
|
||||
ctx.EventLog.Write(ctx0(), "agv.cancel", operator, "agv_task", t.TaskNo,
|
||||
"取消AGV搬运 "+t.SourceDock+"→"+t.TargetDock, map[string]any{"reason": req.Reason})
|
||||
ok(w, nil)
|
||||
}
|
||||
}
|
||||
|
||||
// agvModeHandler 返回 AGV 对接模式(mock / 真实 RCS),供前端提示当前是否在模拟。
|
||||
// agvModeHandler GET /api/agv/mode 返回 AGV 对接模式(代理 MES)
|
||||
func agvModeHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
mock := ctx.Agv.Disable()
|
||||
ok(w, map[string]any{
|
||||
"mock": mock,
|
||||
"tip": func() string {
|
||||
if mock {
|
||||
return "当前为模拟模式(未接真实海康 RCS):任务会立即标记为已到位。现场对接请在配置中关闭 EnableMock 并填写 RCS 地址/appKey/appSecret。"
|
||||
}
|
||||
return "已对接真实海康 RCS。"
|
||||
}(),
|
||||
})
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -349,4 +195,4 @@ func listAgvMaterialsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
|
||||
// syncDockPalletHandler 已移除(dock 真源迁 MES):接驳台托盘占用状态由 MES 侧 PLC 传感器实时读取,
|
||||
// WMS 不再持有 dock 表,原 /api/internal/dock/pallet-sync 无调用方,一并删除。
|
||||
// WMS 不再持有 dock 表,原 /api/internal/dock/pallet-sync 无调用方,一并删除。
|
||||
|
||||
Reference in New Issue
Block a user