feat: 新增收集式校验错误弹窗及工位报警语音播报

新增 ErrorListDialog 组件用于统一展示结构化校验错误信息,实现报错一次收全;新增工位报警语音播报功能,通过浏览器 SpeechSynthesis 播放本工位相关报警;调整物料类别及序列号字段文案,移除「其他」类别;新增工单实际开始字段及采集方式配置;优化 AGV 及 PlcSend 页签刷新逻辑;新增看板物料追溯及工位报警接口;删除 PLC 强制写 M 位及相关测试代码;同步数据库字段注释及补丁。
This commit is contained in:
SunYF
2026-10-20 16:36:26 +08:00
parent f743cf21fb
commit b0c048d9aa
126 changed files with 4603 additions and 1639 deletions
@@ -2,11 +2,16 @@ package handler
import (
"net/http"
"sort"
"strings"
"time"
"bj_power_wms/ent"
"bj_power_wms/ent/inboundorder"
"bj_power_wms/ent/inventory"
"bj_power_wms/ent/material"
"bj_power_wms/ent/outboundorder"
"bj_power_wms/ent/zone"
"bj_power_wms/internal/svc"
)
@@ -46,6 +51,68 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
outToday, _ := ctx.EntClient.OutboundOrder.Query().
Where(outboundorder.CreatedAtGTE(dayStart)).Count(ctx0())
// ---- 库位利用率:库位 = 货架(区域→货架→层→位置 中的「货架」物理存储单元)----
locTotal := 0
if n, e := ctx.EntClient.Zone.Query().Where(zone.LevelEQ(2)).Count(ctx0()); e == nil {
locTotal = n
}
usedKeys := map[string]bool{}
if invs, e := ctx.EntClient.Inventory.Query().Where(inventory.QuantityGT(0)).All(ctx0()); e == nil {
for _, iv := range invs {
usedKeys[locKey(iv.ZoneCode, iv.ShelfNo, "", "")] = true
}
}
locUsed := len(usedKeys)
// ---- 待处理出入库任务 ----
// 入库待处理 = 入库检未闭环(质量状态 空/未检 且未作废);出库待处理 = 已出库待送达。
pendingInbound := 0
if n, e := ctx.EntClient.InboundOrder.Query().
Where(inboundorder.Voided(false), inboundorder.QualityStatusIn("未检", "")).Count(ctx0()); e == nil {
pendingInbound = n
}
pendingOutbound := 0
if n, e := ctx.EntClient.OutboundOrder.Query().
Where(outboundorder.StatusEQ("已出库")).Count(ctx0()); e == nil {
pendingOutbound = n
}
// ---- 出入库动态(带批次号,最近各 15 单合并取前 20)----
movements := []map[string]any{}
inb, _ := ctx.EntClient.InboundOrder.Query().Where(inboundorder.Voided(false)).
Order(ent.Desc(inboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
outb, _ := ctx.EntClient.OutboundOrder.Query().
Order(ent.Desc(outboundorder.FieldCreatedAt)).Limit(15).All(ctx0())
type mv struct{ t int64; m map[string]any }
all := make([]mv, 0, len(inb)+len(outb))
for _, o := range inb {
mat := o.MaterialName
if mat == "" {
mat = o.MaterialCode
}
all = append(all, mv{t: o.CreatedAt, m: map[string]any{
"id": o.InboundNo, "time": time.Unix(o.CreatedAt, 0).Format("2006-01-02 15:04:05"),
"type": "in", "material": mat, "qty": o.Quantity, "operator": o.Operator, "batch": o.BatchNo,
}})
}
for _, o := range outb {
mat := o.MaterialName
if mat == "" {
mat = o.MaterialCode
}
all = append(all, mv{t: o.CreatedAt, m: map[string]any{
"id": o.OutboundNo, "time": time.Unix(o.CreatedAt, 0).Format("2006-01-02 15:04:05"),
"type": "out", "material": mat, "qty": o.Quantity, "operator": o.Operator, "batch": o.BatchNo,
}})
}
sort.Slice(all, func(i, j int) bool { return all[i].t > all[j].t })
if len(all) > 20 {
all = all[:20]
}
for _, x := range all {
movements = append(movements, x.m)
}
ok(w, map[string]any{
"batchCount": batchCount,
"totalQty": totalQty,
@@ -58,11 +125,55 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
"inToday": inToday,
"outToday": outToday,
"zoneDetail": zones,
"locationUsed": locUsed,
"locationTotal": locTotal,
"pendingInbound": pendingInbound,
"pendingOutbound": pendingOutbound,
"movements": movements,
"time": time.Now().Format("2006-01-02 15:04:05"),
})
}
}
// materialQueryInternalHandler 物料档案 + 库存查询(看板物料追溯入口复用,X-API-TOKEN 内部接口)
//
// 入参:code(物料编码,必填)/ batch(批次号,可选)。
// 返回:found(档案是否存在)+ material(档案字段)+ inventory(在库库存行,含批次/库位/质量状态)。
func materialQueryInternalHandler(ctx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
code := strings.TrimSpace(r.URL.Query().Get("code"))
batch := strings.TrimSpace(r.URL.Query().Get("batch"))
resp := map[string]any{"code": code, "found": false, "material": nil, "inventory": []map[string]any{}}
if code == "" {
ok(w, resp)
return
}
if m, e := ctx.EntClient.Material.Query().Where(material.CodeEQ(code)).First(ctx0()); e == nil && m != nil {
resp["found"] = true
resp["material"] = map[string]any{
"code": m.Code, "name": m.Name, "spec": m.Spec, "itemType": m.ItemType,
"unit": m.Unit, "manageMode": m.ManageMode, "snMode": m.SnMode,
}
}
iq := ctx.EntClient.Inventory.Query().Where(inventory.MaterialCodeEQ(code))
if batch != "" {
iq = iq.Where(inventory.BatchNoEQ(batch))
}
if invs, e := iq.Where(inventory.QuantityGT(0)).
Order(ent.Desc(inventory.FieldCreatedAt)).Limit(50).All(ctx0()); e == nil {
rows := make([]map[string]any, 0, len(invs))
for _, iv := range invs {
rows = append(rows, map[string]any{
"zone": iv.ZoneCode, "shelf": iv.ShelfNo, "layer": iv.LayerNo, "position": iv.PositionNo,
"quality": iv.QualityStatus, "qty": iv.Quantity, "batch": iv.BatchNo,
})
}
resp["inventory"] = rows
}
ok(w, resp)
}
}
// finishedInboundRequest 成品入库请求(MES 完工回流内部接口 与 WMS 手工成品入库页 共用契约)
// 定稿(2026-09-07):成品 SN 由 MES 系统生成(系统必发号,实物可不贴码,允许手填覆盖),
// SN 与实物码解耦;完工品落 WMS 统一库存主表(sn_mode=1 序列号=是SN单件, category=3 成品)。