feat: 全端体验与稳定性整改(帮助文档清理/收集式报错/操作列统一/托盘与WS通知/物料同步重推)
- 移除 bj_power_dashboard 旧 React 大屏源码(迁移至 2D SVG 方案) - MES/WMS/工位终端前端:清理 help.js 与 PageHelp 帮助文档,统一操作列与布局,接入请求拦截器 - 新增收集式校验错误弹窗(ErrorListDialog 统一拦截 3015,逐条列现象+建议) - 新增托盘程序(tray)与 WebSocket(ws) 实时通知模块(三端共用) - MES/WMS 物料档案新增同步状态字段,补齐双向失败重推与默认角色 seed - 工单/产能/产品工艺/日排产逻辑调整;拧紧枪按工位配置 - 新增迁移 SQL:扭矩按工位、sysconfig 序列修复 - 更新 技术约束/案例/部署手册/项目说明 等文档
This commit is contained in:
@@ -303,11 +303,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": "已送达",
|
||||
keep := map[string]string{
|
||||
"PENDING": "待备料",
|
||||
"SHIPPED": "配送中",
|
||||
"DONE": "已送达",
|
||||
}
|
||||
// 大屏分区:待备料/配送中归入「待出库」,已送达归入「已送达」。
|
||||
callGroup := func(st string) string {
|
||||
if st == "PENDING" || st == "SHIPPED" {
|
||||
return "pending"
|
||||
}
|
||||
return "done"
|
||||
}
|
||||
// 2026-11-05 叫料包拍板:同一叫料包(package_no)在大屏聚合为一行——
|
||||
// 名称=首物料+“等N种”,数量=包内请求量合计;状态取包内最落后进度
|
||||
//(PENDING > SHIPPED > DONE);无包号(存量单)逐单展示,兼容不变。
|
||||
@@ -337,13 +344,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,
|
||||
})
|
||||
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}
|
||||
@@ -364,10 +372,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,
|
||||
})
|
||||
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