feat: 看板管理屏专属面板与追溯查询三合一 + AGV状态WS实时推送 + 数据库错误友好文案分层
This commit is contained in:
@@ -12,6 +12,7 @@ import (
|
||||
"bj_power_wms/ent/inventory"
|
||||
"bj_power_wms/ent/material"
|
||||
"bj_power_wms/ent/outboundorder"
|
||||
"bj_power_wms/ent/returnorder"
|
||||
"bj_power_wms/ent/zone"
|
||||
"bj_power_wms/internal/svc"
|
||||
)
|
||||
@@ -143,7 +144,10 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
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 }
|
||||
type mv struct {
|
||||
t int64
|
||||
m map[string]any
|
||||
}
|
||||
all := make([]mv, 0, len(inb)+len(outb))
|
||||
for _, o := range inb {
|
||||
mat := o.MaterialName
|
||||
@@ -173,6 +177,86 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
movements = append(movements, x.m)
|
||||
}
|
||||
|
||||
// ===== 客户诉求 13/16/17/18/20:管理屏数据(复用 invs + 现成表,不建新表)=====
|
||||
// 13 返修/不良库存:返修=成品 product_status=返修;不良=quality_status=不合格
|
||||
repairStock, defectStock := 0, 0
|
||||
for _, iv := range invs {
|
||||
if iv.ProductStatus == "返修" {
|
||||
repairStock += iv.Quantity
|
||||
}
|
||||
if iv.QualityStatus == "不合格" {
|
||||
defectStock += iv.Quantity
|
||||
}
|
||||
}
|
||||
// 16 待退料:return_order status=PENDING
|
||||
pendingReturn := 0
|
||||
if n, e := ctx.EntClient.ReturnOrder.Query().Where(returnorder.StatusEQ("PENDING")).Count(ctx0()); e == nil {
|
||||
pendingReturn = n
|
||||
}
|
||||
// 17 低安全库存告警:material.safety_stock>0 且库存可用量<阈值
|
||||
type lowStockRow struct {
|
||||
Material string `json:"material"`
|
||||
MaterialName string `json:"materialName"`
|
||||
Qty int `json:"qty"`
|
||||
SafetyStock int `json:"safetyStock"`
|
||||
}
|
||||
lowStocks := []lowStockRow{}
|
||||
stockByCode := map[string]int{}
|
||||
for _, iv := range invs {
|
||||
if iv.Status == "在库" {
|
||||
stockByCode[iv.MaterialCode] += iv.Quantity - iv.LockedQty
|
||||
}
|
||||
}
|
||||
if mats, e := ctx.EntClient.Material.Query().Where(material.SafetyStockGT(0)).All(ctx0()); e == nil {
|
||||
for _, m := range mats {
|
||||
qty := stockByCode[m.Code]
|
||||
if qty < m.SafetyStock {
|
||||
lowStocks = append(lowStocks, lowStockRow{Material: m.Code, MaterialName: m.Name, Qty: qty, SafetyStock: m.SafetyStock})
|
||||
}
|
||||
}
|
||||
}
|
||||
// 18 仓内作业效率:未闭环单据创建至今超过 2 小时视为超时(单据表无完成时间字段,
|
||||
// 采用「仍活跃且创建>2h」口径;入库=未检未作废,出库=已出库未送达)。
|
||||
overdueOps := 0
|
||||
nowUnix := time.Now().Unix()
|
||||
for _, o := range inb {
|
||||
if !o.Voided && (o.QualityStatus == "未检" || o.QualityStatus == "") && nowUnix-o.CreatedAt > 7200 {
|
||||
overdueOps++
|
||||
}
|
||||
}
|
||||
for _, o := range outb {
|
||||
if o.Status == "已出库" && nowUnix-o.CreatedAt > 7200 {
|
||||
overdueOps++
|
||||
}
|
||||
}
|
||||
// 20 断料颜色预警:待备料/配送中叫料单等待分钟数(前端按 10/20 分黄红映射)
|
||||
callWaits := []map[string]any{}
|
||||
if ctx.Mes != nil {
|
||||
if list, err := ctx.Mes.ListMaterialRequests(ctx0(), ""); err == nil {
|
||||
for _, m := range list {
|
||||
if m.Status != "PENDING" && m.Status != "SHIPPED" {
|
||||
continue
|
||||
}
|
||||
waitMin := 0
|
||||
if m.CreatedAt != "" {
|
||||
if tt, e := time.Parse(time.RFC3339, m.CreatedAt); e == nil {
|
||||
waitMin = int(time.Since(tt).Minutes())
|
||||
}
|
||||
}
|
||||
mat := m.MaterialName
|
||||
if mat == "" {
|
||||
mat = m.MaterialCode
|
||||
}
|
||||
callWaits = append(callWaits, map[string]any{
|
||||
"stationNo": m.StationNo, "material": mat, "waitMin": waitMin,
|
||||
})
|
||||
if len(callWaits) >= 20 {
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ok(w, map[string]any{
|
||||
"batchCount": batchCount,
|
||||
"totalQty": totalQty,
|
||||
@@ -191,7 +275,14 @@ func internalDisplayHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
"pendingInbound": pendingInbound,
|
||||
"pendingOutbound": pendingOutbound,
|
||||
"movements": movements,
|
||||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||||
// 管理屏数据(客户诉求 13/16/17/18/20)
|
||||
"repairStock": repairStock,
|
||||
"defectStock": defectStock,
|
||||
"pendingReturn": pendingReturn,
|
||||
"lowStocks": lowStocks,
|
||||
"overdueOps": overdueOps,
|
||||
"callWaits": callWaits,
|
||||
"time": time.Now().Format("2006-01-02 15:04:05"),
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -303,18 +394,18 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if ctx.Mes != nil {
|
||||
if list, err := ctx.Mes.ListMaterialRequests(r.Context(), ""); err == nil {
|
||||
mesOk = true
|
||||
keep := map[string]string{
|
||||
"PENDING": "待备料",
|
||||
"SHIPPED": "配送中",
|
||||
"DONE": "已送达",
|
||||
}
|
||||
// 大屏分区:待备料/配送中归入「待出库」,已送达归入「已送达」。
|
||||
callGroup := func(st string) string {
|
||||
if st == "PENDING" || st == "SHIPPED" {
|
||||
return "pending"
|
||||
keep := map[string]string{
|
||||
"PENDING": "待备料",
|
||||
"SHIPPED": "配送中",
|
||||
"DONE": "已送达",
|
||||
}
|
||||
// 大屏分区:待备料/配送中归入「待出库」,已送达归入「已送达」。
|
||||
callGroup := func(st string) string {
|
||||
if st == "PENDING" || st == "SHIPPED" {
|
||||
return "pending"
|
||||
}
|
||||
return "done"
|
||||
}
|
||||
return "done"
|
||||
}
|
||||
// 2026-11-05 叫料包拍板:同一叫料包(package_no)在大屏聚合为一行——
|
||||
// 名称=首物料+“等N种”,数量=包内请求量合计;状态取包内最落后进度
|
||||
//(PENDING > SHIPPED > DONE);无包号(存量单)逐单展示,兼容不变。
|
||||
@@ -328,7 +419,7 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
}
|
||||
rankOf := map[string]int{"PENDING": 0, "SHIPPED": 1, "DONE": 2}
|
||||
pkgs := map[string]*pkgAgg{}
|
||||
order := []string{} // 保持 MES 排序(created desc)
|
||||
order := []string{} // 保持 MES 排序(created desc)
|
||||
for _, m := range list { // MES 已按 created_at desc, id desc 排序(logic/call.go:743)
|
||||
label, ok2 := keep[m.Status]
|
||||
if !ok2 {
|
||||
@@ -344,14 +435,14 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
if mat == "" {
|
||||
mat = m.MaterialCode
|
||||
}
|
||||
if m.PackageNo == "" {
|
||||
calls = append(calls, map[string]any{
|
||||
"time": t, "stationNo": m.StationNo, "material": mat,
|
||||
"qty": m.ReqQty, "status": label, "statusKey": m.Status,
|
||||
"group": callGroup(m.Status),
|
||||
})
|
||||
continue
|
||||
}
|
||||
if m.PackageNo == "" {
|
||||
calls = append(calls, map[string]any{
|
||||
"time": t, "stationNo": m.StationNo, "material": mat,
|
||||
"qty": m.ReqQty, "status": label, "statusKey": m.Status,
|
||||
"group": callGroup(m.Status),
|
||||
})
|
||||
continue
|
||||
}
|
||||
pg := pkgs[m.PackageNo]
|
||||
if pg == nil {
|
||||
pg = &pkgAgg{time: t, stationNo: m.StationNo, material: mat, rank: 0}
|
||||
@@ -372,11 +463,11 @@ func internalDisplayCallsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||||
mat = fmt.Sprintf("%s 等%d种", mat, pg.kinds)
|
||||
}
|
||||
sk := statusKeys[pg.rank]
|
||||
calls = append(calls, map[string]any{
|
||||
"time": pg.time, "stationNo": pg.stationNo, "material": mat,
|
||||
"qty": pg.qty, "status": keep[sk], "statusKey": sk,
|
||||
"group": callGroup(sk),
|
||||
})
|
||||
calls = append(calls, map[string]any{
|
||||
"time": pg.time, "stationNo": pg.stationNo, "material": mat,
|
||||
"qty": pg.qty, "status": keep[sk], "statusKey": sk,
|
||||
"group": callGroup(sk),
|
||||
})
|
||||
if len(calls) >= 30 {
|
||||
break
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user