- MES 新增实体:混产模板、产品BOM、产品工艺物料、试制记录(schema + ent 生成码 + logic/handler/前端页) - WMS 实体增强:检验记录、库存、半成品重构;新增序列号库存与短缺代报 - AGV 与产能:AGV 手动点位与链路、物料守卫、短缺预测、原因字典 - 前端通用能力:新增下一步引导组件 NextStepBar,统一帮助文档/布局/请求拦截与操作列 - 工位终端:界面与各 handler 调整(api/store/绑定/PLC/拧紧/上报等) - 配置与文档:更新 mes-api.yaml、WMS README 及案例/产线API/问题记录/项目说明/流程说明
265 lines
11 KiB
Go
265 lines
11 KiB
Go
package handler
|
||
|
||
import (
|
||
"net/http"
|
||
"strconv"
|
||
"strings"
|
||
|
||
"bj_power_wms/internal/svc"
|
||
)
|
||
|
||
// WMS 基础设置配置键(sys_config 表,系统管理员「基础设置」页维护,保存即生效)。
|
||
const (
|
||
CfgArchiveRemindDays = "archive.remind.days" // 数据归档提醒周期(天,0=关闭)
|
||
CfgArchiveBackupPath = "archive.backup.path" // 备份默认目标路径(记住上次成功路径)
|
||
CfgArchiveProtectDays = "archive.protect.days" // 数据保护期(天):仅允许删除该天数之前的数据,默认 180
|
||
CfgLocationRule = "location.recommend.rule" // 库位推荐规则:last=上次位置优先 / same_shelf=同货架优先
|
||
CfgInboundOrderPrefix = "inbound.order.prefix" // 入库单默认前缀/流水规则
|
||
CfgAttachmentMaxSize = "attachment.max.size.hint" // 附件单文件大小上限提示(MB)
|
||
// 库存大屏(/display)配置组(2026-10-27:大屏相关配置进基础设置)
|
||
CfgDisplayStockTitle = "display.stock.title" // 大屏主标题
|
||
CfgDisplayStockCorner = "display.stock.corner" // 大屏左上角角标文案
|
||
CfgDisplayStockRefresh = "display.stock.refresh" // 概览刷新间隔(秒)
|
||
CfgDisplayCallsRefresh = "display.calls.refresh" // 备料叫料池刷新间隔(秒)
|
||
CfgDisplayAgeBuckets = "display.age.buckets" // 库龄分档阈值(天,逗号分隔 3 档,升序)
|
||
// MES 对接(2026-11-02:页面可配,保存即生效;空=回退 yaml 配置)
|
||
CfgMesBaseURL = "mes.base.url" // MES 服务地址(如 http://127.0.0.1:8888)
|
||
// 新待办语音播报(问题8):0=关闭 1=开启;每台电脑各自读取、各自播报
|
||
CfgVoiceNotify = "wms.voice.notify"
|
||
)
|
||
|
||
var wmsSettingsDefaults = map[string]string{
|
||
CfgArchiveRemindDays: "7",
|
||
CfgArchiveBackupPath: "",
|
||
CfgArchiveProtectDays: "180",
|
||
CfgLocationRule: "last",
|
||
CfgInboundOrderPrefix: "",
|
||
CfgAttachmentMaxSize: "50",
|
||
CfgDisplayStockTitle: "库存动态大屏",
|
||
CfgDisplayStockCorner: "库房监控",
|
||
CfgDisplayStockRefresh: "5",
|
||
CfgDisplayCallsRefresh: "10",
|
||
CfgDisplayAgeBuckets: "30,90,180",
|
||
CfgVoiceNotify: "0",
|
||
}
|
||
|
||
// SettingsVO WMS 基础设置视图(保存即生效)。
|
||
type SettingsVO struct {
|
||
ArchiveRemindDays int `json:"archiveRemindDays"` // 数据归档提醒周期(天,0=关闭)
|
||
ArchiveBackupPath string `json:"archiveBackupPath"` // 备份默认目标路径
|
||
LocationRule string `json:"locationRule"` // 库位推荐规则
|
||
InboundOrderPrefix string `json:"inboundOrderPrefix"` // 入库单默认前缀
|
||
AttachmentMaxSize int `json:"attachmentMaxSize"` // 附件单文件大小上限提示(MB)
|
||
DisplayStockTitle string `json:"displayStockTitle"` // 库存大屏主标题
|
||
DisplayStockCorner string `json:"displayStockCorner"` // 库存大屏左上角角标文案
|
||
DisplayStockRefresh int `json:"displayStockRefresh"` // 库存大屏概览刷新间隔(秒)
|
||
DisplayCallsRefresh int `json:"displayCallsRefresh"` // 备料叫料池刷新间隔(秒)
|
||
DisplayAgeBuckets string `json:"displayAgeBuckets"` // 库龄分档阈值(天,逗号分隔 3 档)
|
||
MesBaseURL string `json:"mesBaseURL"` // MES 服务地址(空=用配置文件默认)
|
||
VoiceNotify int `json:"voiceNotify"` // 新待办语音播报 0=关闭 / 1=开启
|
||
}
|
||
|
||
func cfgStr(kv map[string]string, key, def string) string {
|
||
if v, ok := kv[key]; ok && strings.TrimSpace(v) != "" {
|
||
return v
|
||
}
|
||
return def
|
||
}
|
||
|
||
func cfgInt(kv map[string]string, key string, def int) int {
|
||
v := cfgStr(kv, key, strconv.Itoa(def))
|
||
n, err := strconv.Atoi(v)
|
||
if err != nil {
|
||
return def
|
||
}
|
||
return n
|
||
}
|
||
|
||
func loadSettingsKV(ctx *svc.ServiceContext) map[string]string {
|
||
kv := map[string]string{}
|
||
if rows, err := ctx.EntClient.SysConfig.Query().All(ctx0()); err == nil {
|
||
for _, r := range rows {
|
||
kv[r.Key] = r.Value
|
||
}
|
||
}
|
||
return kv
|
||
}
|
||
|
||
// CfgIntFromSysConfig 读取整型配置(未配置/非法回退 def),供提醒等模块复用。
|
||
func CfgIntFromSysConfig(ctx *svc.ServiceContext, key string, def int) int {
|
||
kv := loadSettingsKV(ctx)
|
||
return cfgInt(kv, key, def)
|
||
}
|
||
|
||
// SettingsHandler GET /api/settings 基础设置(admin-only)
|
||
func SettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
kv := loadSettingsKV(ctx)
|
||
vo := SettingsVO{
|
||
ArchiveRemindDays: cfgInt(kv, CfgArchiveRemindDays, 7),
|
||
ArchiveBackupPath: cfgStr(kv, CfgArchiveBackupPath, ""),
|
||
LocationRule: cfgStr(kv, CfgLocationRule, "last"),
|
||
InboundOrderPrefix: cfgStr(kv, CfgInboundOrderPrefix, ""),
|
||
AttachmentMaxSize: cfgInt(kv, CfgAttachmentMaxSize, 50),
|
||
DisplayStockTitle: cfgStr(kv, CfgDisplayStockTitle, wmsSettingsDefaults[CfgDisplayStockTitle]),
|
||
DisplayStockCorner: cfgStr(kv, CfgDisplayStockCorner, wmsSettingsDefaults[CfgDisplayStockCorner]),
|
||
DisplayStockRefresh: cfgInt(kv, CfgDisplayStockRefresh, 5),
|
||
DisplayCallsRefresh: cfgInt(kv, CfgDisplayCallsRefresh, 10),
|
||
DisplayAgeBuckets: cfgStr(kv, CfgDisplayAgeBuckets, wmsSettingsDefaults[CfgDisplayAgeBuckets]),
|
||
MesBaseURL: strings.TrimRight(cfgStr(kv, CfgMesBaseURL, ""), "/"),
|
||
VoiceNotify: cfgInt(kv, CfgVoiceNotify, 0),
|
||
}
|
||
ok(w, vo)
|
||
}
|
||
}
|
||
|
||
// SaveSettingsHandler PUT /api/settings 保存基础设置(admin-only)
|
||
func SaveSettingsHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
var req SettingsVO
|
||
if err := parseJSON(r, &req); err != nil {
|
||
fail(w, http.StatusBadRequest, "请求体解析失败")
|
||
return
|
||
}
|
||
if req.ArchiveRemindDays < 0 || req.ArchiveRemindDays > 365 {
|
||
fail(w, http.StatusBadRequest, "提醒周期需 0~365 天")
|
||
return
|
||
}
|
||
if req.AttachmentMaxSize <= 0 || req.AttachmentMaxSize > 1024 {
|
||
fail(w, http.StatusBadRequest, "附件单文件大小上限提示需 1~1024 MB")
|
||
return
|
||
}
|
||
if req.LocationRule != "last" && req.LocationRule != "same_shelf" {
|
||
fail(w, http.StatusBadRequest, "库位推荐规则仅支持 last(上次位置优先)/ same_shelf(同货架优先)")
|
||
return
|
||
}
|
||
title := strings.TrimSpace(req.DisplayStockTitle)
|
||
if title == "" || len(title) > 60 {
|
||
fail(w, http.StatusBadRequest, "库存大屏主标题需 1~60 字")
|
||
return
|
||
}
|
||
corner := strings.TrimSpace(req.DisplayStockCorner)
|
||
if len(corner) > 30 {
|
||
fail(w, http.StatusBadRequest, "库存大屏角标文案需 0~30 字")
|
||
return
|
||
}
|
||
if req.DisplayStockRefresh < 3 || req.DisplayStockRefresh > 120 {
|
||
fail(w, http.StatusBadRequest, "库存大屏概览刷新间隔需 3~120 秒")
|
||
return
|
||
}
|
||
if req.DisplayCallsRefresh < 5 || req.DisplayCallsRefresh > 300 {
|
||
fail(w, http.StatusBadRequest, "备料叫料池刷新间隔需 5~300 秒")
|
||
return
|
||
}
|
||
buckets := parseAgeBuckets(req.DisplayAgeBuckets)
|
||
if buckets == nil {
|
||
fail(w, http.StatusBadRequest, "库龄分档阈值需为逗号分隔的 3 个升序天数(如 30,90,180),各档 1~3650")
|
||
return
|
||
}
|
||
// MES 服务地址:留空=回退配置文件默认;填了必须 http(s):// 开头(2026-11-02)
|
||
mesURL := strings.TrimRight(strings.TrimSpace(req.MesBaseURL), "/")
|
||
if mesURL != "" {
|
||
if !strings.HasPrefix(mesURL, "http://") && !strings.HasPrefix(mesURL, "https://") {
|
||
fail(w, http.StatusBadRequest, "MES 服务地址需以 http:// 或 https:// 开头(如 http://127.0.0.1:8888)")
|
||
return
|
||
}
|
||
if len(mesURL) > 200 {
|
||
fail(w, http.StatusBadRequest, "MES 服务地址过长(≤200 字)")
|
||
return
|
||
}
|
||
}
|
||
if req.VoiceNotify != 0 && req.VoiceNotify != 1 {
|
||
fail(w, http.StatusBadRequest, "新待办语音播报开关仅支持 0(关闭)/ 1(开启)")
|
||
return
|
||
}
|
||
kv := map[string]string{
|
||
CfgArchiveRemindDays: strconv.Itoa(req.ArchiveRemindDays),
|
||
CfgArchiveBackupPath: strings.TrimSpace(req.ArchiveBackupPath),
|
||
CfgLocationRule: req.LocationRule,
|
||
CfgInboundOrderPrefix: strings.TrimSpace(req.InboundOrderPrefix),
|
||
CfgAttachmentMaxSize: strconv.Itoa(req.AttachmentMaxSize),
|
||
CfgDisplayStockTitle: title,
|
||
CfgDisplayStockCorner: corner,
|
||
CfgDisplayStockRefresh: strconv.Itoa(req.DisplayStockRefresh),
|
||
CfgDisplayCallsRefresh: strconv.Itoa(req.DisplayCallsRefresh),
|
||
CfgDisplayAgeBuckets: strconv.Itoa(buckets[0]) + "," + strconv.Itoa(buckets[1]) + "," + strconv.Itoa(buckets[2]),
|
||
CfgMesBaseURL: mesURL,
|
||
CfgVoiceNotify: strconv.Itoa(req.VoiceNotify),
|
||
}
|
||
for k, v := range kv {
|
||
if err := upsertConfig(ctx, k, v, ""); err != nil {
|
||
fail(w, http.StatusInternalServerError, err.Error())
|
||
return
|
||
}
|
||
}
|
||
// MES 地址热生效(空=回退配置文件默认)
|
||
ctx.Mes.SetBaseURL(mesURL)
|
||
ok(w, map[string]any{"ok": true})
|
||
}
|
||
}
|
||
|
||
// parseAgeBuckets 解析库龄分档阈值 "30,90,180" → [30 90 180];非法返回 nil。
|
||
func parseAgeBuckets(s string) []int {
|
||
parts := strings.Split(s, ",")
|
||
if len(parts) != 3 {
|
||
return nil
|
||
}
|
||
out := make([]int, 3)
|
||
for i, p := range parts {
|
||
n, err := strconv.Atoi(strings.TrimSpace(p))
|
||
if err != nil || n < 1 || n > 3650 {
|
||
return nil
|
||
}
|
||
out[i] = n
|
||
}
|
||
if out[0] >= out[1] || out[1] >= out[2] {
|
||
return nil
|
||
}
|
||
return out
|
||
}
|
||
|
||
// AgeBucketsFromConfig 读库龄分档配置(非法回退默认 30/90/180),供大屏聚合接口用。
|
||
func AgeBucketsFromConfig(ctx *svc.ServiceContext) []int {
|
||
if b := parseAgeBuckets(cfgStr(loadSettingsKV(ctx), CfgDisplayAgeBuckets, "30,90,180")); b != nil {
|
||
return b
|
||
}
|
||
return []int{30, 90, 180}
|
||
}
|
||
|
||
// DisplayConfigVO 库存大屏运行配置(免登录只读,仅展示性配置,不含敏感信息)。
|
||
type DisplayConfigVO struct {
|
||
Title string `json:"title"` // 大屏主标题
|
||
Corner string `json:"corner"` // 左上角角标文案
|
||
RefreshSeconds int `json:"refreshSeconds"` // 概览刷新间隔(秒)
|
||
CallsRefreshSeconds int `json:"callsRefreshSeconds"` // 备料叫料池刷新间隔(秒)
|
||
AgeBuckets []int `json:"ageBuckets"` // 库龄分档阈值(天,3 档升序)
|
||
VoiceNotify int `json:"voiceNotify"` // 新待办语音播报 0=关闭 / 1=开启(免登录供前端读取)
|
||
}
|
||
|
||
// displayConfigHandler GET /api/display/config 大屏运行配置(免登录,与 overview 同组)。
|
||
func displayConfigHandler(ctx *svc.ServiceContext) http.HandlerFunc {
|
||
return func(w http.ResponseWriter, r *http.Request) {
|
||
kv := loadSettingsKV(ctx)
|
||
ok(w, DisplayConfigVO{
|
||
Title: cfgStr(kv, CfgDisplayStockTitle, wmsSettingsDefaults[CfgDisplayStockTitle]),
|
||
Corner: cfgStr(kv, CfgDisplayStockCorner, wmsSettingsDefaults[CfgDisplayStockCorner]),
|
||
RefreshSeconds: cfgInt(kv, CfgDisplayStockRefresh, 5),
|
||
CallsRefreshSeconds: cfgInt(kv, CfgDisplayCallsRefresh, 10),
|
||
AgeBuckets: AgeBucketsFromConfig(ctx),
|
||
VoiceNotify: cfgInt(kv, CfgVoiceNotify, 0),
|
||
})
|
||
}
|
||
}
|
||
|
||
// upsertConfig 幂等写入配置(sys_config key/value)。
|
||
// 2026-11-14 根治 SQLSTATE 23505:原实现「先查后插」在并发/重复提交下两个请求会同时走到
|
||
// Create(),撞 sys_config_pkey 或 sys_config_key_key。改为单条 INSERT ... ON CONFLICT (key)
|
||
// DO UPDATE,由数据库保证串行收敛(与 MES internal/logic/settings.go 同口径)。
|
||
func upsertConfig(ctx *svc.ServiceContext, key, value, remark string) error {
|
||
_, err := ctx.SQLDB.ExecContext(ctx0(),
|
||
`INSERT INTO sys_config (key, value, remark) VALUES ($1, $2, $3)
|
||
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, remark = EXCLUDED.remark`,
|
||
key, value, remark)
|
||
return err
|
||
}
|