feat: 退料闭环定稿(损耗台账/备料清单/退料AGV自动派车/剩余量参考)+ 工位托盘守卫
- MES 新增损耗台账 loss_ledger,差异确认损耗接口 ConfirmReceiveLoss(按工单归集) - 备料清单 preparation:MES 按 日计划×工单×工位×物料 实时计算,WMS 只读展示 PreparationList - 退料闭环:N5 工位托盘守卫(未完成禁止退料)、退料 AGV 自动派车(JBT21 空位判定 + 托盘回收链路)、退料参考剩余量接口(应剩余=实备-已耗-已退-已损) - 新增 AGV 车辆状态表 agv_vehicle_state 及查询 - 整合接驳台/叫料池/库存锁既有闭环,清理 sql 目录注释生成脚本与 catalog,更新文档
This commit is contained in:
@@ -104,10 +104,23 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodPost, Path: "/api/call/reject", Handler: requirePerm(ctx, "call:manage", callRejectHandler(ctx))},
|
||||
// AGV 三段链装货确认(2026-11-03 三层机制):到位待令 → 库管「确认装车并送货」
|
||||
{Method: http.MethodPost, Path: "/api/call/confirm-load", Handler: requirePerm(ctx, "call:manage", ConfirmCallLoadHandler(ctx))},
|
||||
// 库管人工派车(2026-11-03 定论:废除备料完成自动派车):点「送货」AGV 才出发
|
||||
{Method: http.MethodPost, Path: "/api/call/dispatch", Handler: requirePerm(ctx, "call:manage", DispatchCallHandler(ctx))},
|
||||
// 托盘工作台(2026-11-03):接驳台台账列表 + 手动派 AGV 回收空托盘(单点步进、到位待令)
|
||||
{Method: http.MethodGet, Path: "/api/pallet/docks", Handler: PalletDocksHandler(ctx)},
|
||||
{Method: http.MethodGet, Path: "/api/pallet/station-docks", Handler: StationDocksProxyHandler(ctx)},
|
||||
{Method: http.MethodPost, Path: "/api/pallet/dispatch", Handler: requirePerm(ctx, "call:manage", PalletDispatchHandler(ctx))},
|
||||
// E4 托盘余料明细(2026-11-04 拍板):代发起退料弹窗自动带出(只读转发 MES)
|
||||
{Method: http.MethodGet, Path: "/api/pallet/residual", Handler: palletResidualHandler(ctx)},
|
||||
// JBT21 空位查询(2026-11-04 定稿 Q5:无空位派 AGV 回收按钮禁用并提示;只读转发 MES)
|
||||
{Method: http.MethodGet, Path: "/api/pallet/jbt21-free", Handler: Jbt21FreeHandler(ctx)},
|
||||
},
|
||||
)
|
||||
|
||||
// P1 备料清单(2026-11-04 用户拍板):只读展示"今天及以后×工单×工位×物料×数量",数据源 MES 日排产实时算
|
||||
server.AddRoutes(
|
||||
[]rest.Route{
|
||||
{Method: http.MethodGet, Path: "/api/preparation/list", Handler: requirePerm(ctx, "preparation:view", queryPreparationListHandler(ctx))},
|
||||
},
|
||||
)
|
||||
|
||||
@@ -205,6 +218,11 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/return-order/suggest-location", Handler: suggestReturnLocationHandler(ctx)},
|
||||
// 库管代工位退料(2026-11-03 拍板):库管替操作工建退库单(选工位/工单/物料/数量/接驳台)
|
||||
{Method: http.MethodPost, Path: "/api/return-order/manual", Handler: createReturnOrderInternalHandler(ctx)},
|
||||
// 取消 PENDING 退料单(2026-11-04 拍板:库房可取消工位申请;已收货不可取消;联动作废未完成 AGV 任务)
|
||||
{Method: http.MethodPost, Path: "/api/return-order/cancel", Handler: cancelReturnOrderHandler(ctx)},
|
||||
// 余量参考值(2026-11-04 定稿:剩余余量=应剩余量−已退余量−已损耗,转发 MES 聚合;仅展示不阻断)
|
||||
{Method: http.MethodGet, Path: "/api/return-order/reference", Handler: returnReferenceHandler(ctx)},
|
||||
// D1 工单备料台账已于 2026-11-04 按用户拍板移除(台账页/路由/权限一并退役,不再复活)
|
||||
},
|
||||
)
|
||||
|
||||
@@ -330,6 +348,12 @@ func RegisterHandlers(server *rest.Server, ctx *svc.ServiceContext) {
|
||||
{Method: http.MethodGet, Path: "/api/internal/materials", Handler: wrapInternal(ctx)(queryMaterialsHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/internal/material/list-all", Handler: wrapInternal(ctx)(listMaterialsHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/return-order", Handler: wrapInternal(ctx)(createReturnOrderInternalHandler(ctx))},
|
||||
// 取消退料单/派车标记/工位列表/已退汇总(2026-11-04 口径定稿)
|
||||
{Method: http.MethodPost, Path: "/api/internal/return-order/cancel", Handler: wrapInternal(ctx)(cancelReturnOrderInternalHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/internal/return-order/station-list", Handler: wrapInternal(ctx)(stationReturnListInternalHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/internal/return-order/pending-agv", Handler: wrapInternal(ctx)(pendingAgvReturnsInternalHandler(ctx))},
|
||||
{Method: http.MethodPost, Path: "/api/internal/return-order/mark-dispatched", Handler: wrapInternal(ctx)(markReturnDispatchedInternalHandler(ctx))},
|
||||
{Method: http.MethodGet, Path: "/api/internal/return-order/returned-summary", Handler: wrapInternal(ctx)(returnedSummaryInternalHandler(ctx))},
|
||||
// MES 质量检验(过程检/完工检)判不合格 → 联动 WMS 在库处置(按物料+SN/批次定位库存行)
|
||||
{Method: http.MethodPost, Path: "/api/internal/inventory/dispose", Handler: wrapInternal(ctx)(internalInventoryDisposeHandler(ctx))},
|
||||
// AGV 到位回写(MES AGV 回调调用):出库单 已出库 → 已送达(补齐状态机无写者的断头路)
|
||||
|
||||
Reference in New Issue
Block a user